From c69d873f31440e6887288d38a9d009451874efd8 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Fri, 1 Feb 2008 12:37:51 +0000
Subject: 	* string.h: Re-enable inline strcasematch and strncasematch 
 implementations and rename to ascii_strcasematch/ascii_strncasematch. 	*
 dcrt0.cc: Replace str[n]casematch with ascii_str[n]casematch where 
 applicable. 	* environ.cc: Ditto. 	* fhandler_process.cc: Ditto. 	*
 hookapi.cc: Ditto. 	* path.cc: Ditto. 	* spawn.cc: Ditto. 	*
 strace.cc: Ditto. 	* syscalls.cc: Ditto. 	* uinfo.cc: Ditto. 	*
 winf.cc: Ditto.

---
 winsup/cygwin/string.h | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'winsup/cygwin/string.h')

diff --git a/winsup/cygwin/string.h b/winsup/cygwin/string.h
index cb870646e..ad262e82d 100644
--- a/winsup/cygwin/string.h
+++ b/winsup/cygwin/string.h
@@ -61,15 +61,10 @@ strechr (const char *s, int c)
 
 #ifdef __INSIDE_CYGWIN__
 
-/* Don't use.  Not NLS aware. */
-#if 0 // Not NLS aware
 extern const char isalpha_array[];
 
-#undef strcasematch
-#define strcasematch cygwin_strcasematch
-
 static inline int
-cygwin_strcasematch (const char *cs, const char *ct)
+ascii_strcasematch (const char *cs, const char *ct)
 {
   register int __res;
   int d0, d1;
@@ -95,11 +90,8 @@ cygwin_strcasematch (const char *cs, const char *ct)
   return __res;
 }
 
-#undef strncasematch
-#define strncasematch cygwin_strncasematch
-
 static inline int
-cygwin_strncasematch (const char *cs, const char *ct, size_t n)
+ascii_strncasematch (const char *cs, const char *ct, size_t n)
 {
   register int __res;
   int d0, d1, d2;
@@ -126,7 +118,7 @@ cygwin_strncasematch (const char *cs, const char *ct, size_t n)
 
   return __res;
 }
-#else
+
 #undef strcasecmp
 #define strcasecmp cygwin_strcasecmp
 int __stdcall cygwin_strcasecmp (const char *, const char *);
@@ -137,7 +129,6 @@ int __stdcall cygwin_strncasecmp (const char *, const char *, size_t);
 
 #define strcasematch(s1,s2)	(!cygwin_strcasecmp ((s1),(s2)))
 #define strncasematch(s1,s2,n)	(!cygwin_strncasecmp ((s1),(s2),(n)))
-#endif
 
 #undef strlwr
 #define strlwr cygwin_strlwr
-- 
cgit v1.2.3