* 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.

9 files changed, 162 insertions, 33 deletions

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  <dannysmith@users.sourceforge.net>
+
+	* 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  <dannysmith@users.sourceforge.net>
 
 	* 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/isascii.o b/winsup/mingw/isascii.o
new file mode 100755
index 000000000..0da0cb673
--- /dev/null
+++ b/winsup/mingw/isascii.o
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 <colin@bird.fu.is.saga-u.ac.jp>
+ *
+ *  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 <ctype.h>
+
+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 <colin@bird.fu.is.saga-u.ac.jp>
+ *
+ *  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 <ctype.h>
+
+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 <colin@bird.fu.is.saga-u.ac.jp>
+ *
+ *  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 <string.h>
+
+int
+strcasecmp (const char *sz1, const char *sz2)
+{
+  return _stricmp (sz1, sz2);
+}
+
diff --git a/winsup/mingw/string_old.c b/winsup/mingw/strncasecmp.c
index c1baeb47e..49ead5f68 100644
--- a/winsup/mingw/string_old.c
+++ b/winsup/mingw/strncasecmp.c
@@ -1,5 +1,5 @@
 /*
- * string_old.c
+ * strncasecmp.c
  *
  * Oldnames from ANSI header string.h
  *
@@ -28,20 +28,8 @@
 #include <string.h>
 
 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/ctype_old.c b/winsup/mingw/toascii.c
index 07eaec1d8..7eebbe885 100644
--- a/winsup/mingw/ctype_old.c
+++ b/winsup/mingw/toascii.c
@@ -1,5 +1,5 @@
 /*
- * ctype_old.c
+ * toascii.c
  *
  * Oldnames from ANSI header ctype.h
  *
@@ -27,11 +27,6 @@
 
 #include <ctype.h>
 
-int
-isascii (int c)
-{
-	return __isascii(c);
-}
 
 int
 toascii (int c)
@@ -39,14 +34,3 @@ 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/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 <colin@bird.fu.is.saga-u.ac.jp>
+ *
+ *  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 <string.h>
+
+int
+wcscmpi (const wchar_t * ws1, const wchar_t * ws2)
+{
+  return _wcsicmp (ws1, ws2);
+}
+