From 620c28a97504f1fc9ad72566693d98f2deb14227 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 15 May 2003 00:21:12 +0000 Subject: * string_old.c: Remove, splitting into... * strcasecmp.c: New file. * strncasecmp.c: New file. * wscmpi.c : New file. * ctype_old.c: Remove, splitting into... * isascii.c: New file. * iscsym.c: New file. * iscsymf.c: New file. * toascii.c: New file. * Makefile.in (MOLD_OBJS): Adjust. (SRCDIST_FILES): Adjust. --- winsup/mingw/ChangeLog | 14 ++++++++++++ winsup/mingw/Makefile.in | 10 ++++++--- winsup/mingw/ctype_old.c | 52 --------------------------------------------- winsup/mingw/isascii.o | Bin 0 -> 356 bytes winsup/mingw/iscsym.c | 34 +++++++++++++++++++++++++++++ winsup/mingw/iscsymf.c | 35 ++++++++++++++++++++++++++++++ winsup/mingw/strcasecmp.c | 35 ++++++++++++++++++++++++++++++ winsup/mingw/string_old.c | 47 ---------------------------------------- winsup/mingw/strncasecmp.c | 35 ++++++++++++++++++++++++++++++ winsup/mingw/toascii.c | 36 +++++++++++++++++++++++++++++++ winsup/mingw/wcscmpi.c | 35 ++++++++++++++++++++++++++++++ 11 files changed, 231 insertions(+), 102 deletions(-) delete mode 100644 winsup/mingw/ctype_old.c create mode 100755 winsup/mingw/isascii.o create mode 100644 winsup/mingw/iscsym.c create mode 100644 winsup/mingw/iscsymf.c create mode 100644 winsup/mingw/strcasecmp.c delete mode 100644 winsup/mingw/string_old.c create mode 100644 winsup/mingw/strncasecmp.c create mode 100644 winsup/mingw/toascii.c create mode 100644 winsup/mingw/wcscmpi.c diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 7b65f62b4..b159d96e2 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,17 @@ +2003-05-14 Danny Smith + + * string_old.c: Remove, splitting into... + * strcasecmp.c: New file. + * strncasecmp.c: New file. + * wscmpi.c : New file. + * ctype_old.c: Remove, splitting into... + * isascii.c: New file. + * iscsym.c: New file. + * iscsymf.c: New file. + * toascii.c: New file. + * Makefile.in (MOLD_OBJS): Adjust. + (SRCDIST_FILES): Adjust. + 2003-05-13 Danny Smith * include/math.h (fabs) : Remove inline definition. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 289063a2d..0404d84b4 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -153,7 +153,9 @@ CRT0S = crt1.o dllcrt1.o crt2.o dllcrt2.o CRT_noglob.o crtmt.o crtst.o \ MINGW_OBJS = CRTglob.o CRTfmode.o CRTinit.o dllmain.o gccmain.o \ main.o crtst.o mthr_stub.o CRT_fp10.o txtmode.o \ pseudo-reloc.o pseudo-reloc-list.o -MOLD_OBJS = ctype_old.o string_old.o + +MOLD_OBJS = isascii.o iscsym.o iscsymf.o toascii.o \ + strcasecmp.o strncasecmp.o wcscmpi.o LIBS = libcrtdll.a libmsvcrt.a libmsvcrtd.a libmingw32.a \ libcoldname.a libmoldname.a libmoldnamed.a $(LIBM_A) libmingwthrd.a @@ -162,10 +164,12 @@ DLLS = $(THREAD_DLL_NAME) SRCDIST_FILES = CRT_noglob.c CRTfmode.c CRTglob.c CRTinit.c ChangeLog \ Makefile.in README TODO config.guess config.sub configure configure.in \ -crt1.c crtdll.def crtmt.c crtst.c ctype_old.c dllcrt1.c dllmain.c \ +crt1.c crtdll.def crtmt.c crtst.c dllcrt1.c dllmain.c \ gccmain.c init.c install-sh jamfile main.c mkinstalldirs \ moldname.def.in msvcrt.def.in \ -mthr.c mthr_init.c mthr_stub.c readme.txt string_old.c \ +mthr.c mthr_init.c mthr_stub.c readme.txt \ +isascii.c iscsym.c iscsymf.c toascii.c \ +strcasecmp.c strncasecmp.c wcscmpi.c \ CRT_fp8.c CRT_fp10.c test_headers.c txtmode.c binmode.c pseudo-reloc.c \ pseudo-reloc-list.c diff --git a/winsup/mingw/ctype_old.c b/winsup/mingw/ctype_old.c deleted file mode 100644 index 07eaec1d8..000000000 --- a/winsup/mingw/ctype_old.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * ctype_old.c - * - * Oldnames from ANSI header ctype.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - * Contributors: - * Created by Colin Peters - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warrenties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision$ - * $Author$ - * $Date$ - * - */ - -#include - -int -isascii (int c) -{ - return __isascii(c); -} - -int -toascii (int c) -{ - return __toascii(c); -} - -int -iscsymf (int c) -{ - return __iscsymf(c); -} - -int -iscsym (int c) -{ - return __iscsym(c); -} diff --git a/winsup/mingw/isascii.o b/winsup/mingw/isascii.o new file mode 100755 index 000000000..0da0cb673 Binary files /dev/null and b/winsup/mingw/isascii.o differ diff --git a/winsup/mingw/iscsym.c b/winsup/mingw/iscsym.c new file mode 100644 index 000000000..125b4964b --- /dev/null +++ b/winsup/mingw/iscsym.c @@ -0,0 +1,34 @@ +/* + * iscsym.c + * + * Oldnames from ANSI header ctype.h + * + * Some wrapper functions for those old name functions whose appropriate + * equivalents are not simply underscore prefixed. + * + * Contributors: + * Created by Colin Peters + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision$ + * $Author$ + * $Date$ + * + */ + +#include + +int +iscsym (int c) +{ + return __iscsym(c); +} diff --git a/winsup/mingw/iscsymf.c b/winsup/mingw/iscsymf.c new file mode 100644 index 000000000..417b9d20c --- /dev/null +++ b/winsup/mingw/iscsymf.c @@ -0,0 +1,35 @@ +/* + * iscsymf.c + * + * Oldnames from ANSI header ctype.h + * + * Some wrapper functions for those old name functions whose appropriate + * equivalents are not simply underscore prefixed. + * + * Contributors: + * Created by Colin Peters + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision$ + * $Author$ + * $Date$ + * + */ + +#include + +int +iscsymf (int c) +{ + return __iscsymf(c); +} + diff --git a/winsup/mingw/strcasecmp.c b/winsup/mingw/strcasecmp.c new file mode 100644 index 000000000..ce5351c2c --- /dev/null +++ b/winsup/mingw/strcasecmp.c @@ -0,0 +1,35 @@ +/* + * strcasecmp.c + * + * Oldnames from ANSI header string.h + * + * Some wrapper functions for those old name functions whose appropriate + * equivalents are not simply underscore prefixed. + * + * Contributors: + * Created by Colin Peters + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision$ + * $Author$ + * $Date$ + * + */ + +#include + +int +strcasecmp (const char *sz1, const char *sz2) +{ + return _stricmp (sz1, sz2); +} + diff --git a/winsup/mingw/string_old.c b/winsup/mingw/string_old.c deleted file mode 100644 index c1baeb47e..000000000 --- a/winsup/mingw/string_old.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * string_old.c - * - * Oldnames from ANSI header string.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - * Contributors: - * Created by Colin Peters - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warrenties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision$ - * $Author$ - * $Date$ - * - */ - -#include - -int -strcasecmp (const char *sz1, const char *sz2) -{ - return _stricmp (sz1, sz2); -} - -int -strncasecmp (const char *sz1, const char *sz2, size_t sizeMaxCompare) -{ - return _strnicmp (sz1, sz2, sizeMaxCompare); -} - -int -wcscmpi (const wchar_t * ws1, const wchar_t * ws2) -{ - return _wcsicmp (ws1, ws2); -} - diff --git a/winsup/mingw/strncasecmp.c b/winsup/mingw/strncasecmp.c new file mode 100644 index 000000000..49ead5f68 --- /dev/null +++ b/winsup/mingw/strncasecmp.c @@ -0,0 +1,35 @@ +/* + * strncasecmp.c + * + * Oldnames from ANSI header string.h + * + * Some wrapper functions for those old name functions whose appropriate + * equivalents are not simply underscore prefixed. + * + * Contributors: + * Created by Colin Peters + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision$ + * $Author$ + * $Date$ + * + */ + +#include + +int +strncasecmp (const char *sz1, const char *sz2, size_t sizeMaxCompare) +{ + return _strnicmp (sz1, sz2, sizeMaxCompare); +} + diff --git a/winsup/mingw/toascii.c b/winsup/mingw/toascii.c new file mode 100644 index 000000000..7eebbe885 --- /dev/null +++ b/winsup/mingw/toascii.c @@ -0,0 +1,36 @@ +/* + * toascii.c + * + * Oldnames from ANSI header ctype.h + * + * Some wrapper functions for those old name functions whose appropriate + * equivalents are not simply underscore prefixed. + * + * Contributors: + * Created by Colin Peters + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision$ + * $Author$ + * $Date$ + * + */ + +#include + + +int +toascii (int c) +{ + return __toascii(c); +} + diff --git a/winsup/mingw/wcscmpi.c b/winsup/mingw/wcscmpi.c new file mode 100644 index 000000000..a97f78e62 --- /dev/null +++ b/winsup/mingw/wcscmpi.c @@ -0,0 +1,35 @@ +/* + * wcscmpi.c + * + * Oldnames from ANSI header string.h + * + * Some wrapper functions for those old name functions whose appropriate + * equivalents are not simply underscore prefixed. + * + * Contributors: + * Created by Colin Peters + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision$ + * $Author$ + * $Date$ + * + */ + +#include + +int +wcscmpi (const wchar_t * ws1, const wchar_t * ws2) +{ + return _wcsicmp (ws1, ws2); +} + -- cgit v1.2.3