Tue Jun 11 15:09:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* io/sys/stat.h (S_ISLNK, S_ISSOCK): Make conditional on __USE_BSD,
	not __USE_GNU.
	* string/string.h (strncasecmp): Likewise.

diff --git a/io/sys/stat.h b/io/sys/stat.h
index 52fa944..2c23102 100644 (file)
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -60,7 +60,7 @@ __BEGIN_DECLS
 #define        S_ISFIFO(mode)  __S_ISTYPE((mode), __S_IFIFO)
 #endif
 
-#ifdef __USE_GNU
+#ifdef __USE_BSD
 #ifdef __S_IFLNK
 #define        S_ISLNK(mode)   __S_ISTYPE((mode), __S_IFLNK)
 #endif

diff --git a/string/string.h b/string/string.h
index 4bd8483..755c631 100644 (file)
--- a/string/string.h
+++ b/string/string.h
@@ -184,16 +184,16 @@ extern int ffs __P ((int __i));
 extern int __strcasecmp __P ((__const char *__s1, __const char *__s2));
 extern int strcasecmp __P ((__const char *__s1, __const char *__s2));
 
+/* Compare no more than N chars of S1 and S2, ignoring case.  */
+extern int strncasecmp __P ((__const char *__s1, __const char *__s2,
+                            size_t __n));
+
 /* Return the next DELIM-delimited token from *STRINGP,
    terminating it with a '\0', and update *STRINGP to point past it.  */
 extern char *strsep __P ((char **__stringp, __const char *__delim));
 #endif
 
 #ifdef __USE_GNU
-/* Compare no more than N chars of S1 and S2, ignoring case.  */
-extern int strncasecmp __P ((__const char *__s1, __const char *__s2,
-                            size_t __n));
-
 /* Return a string describing the meaning of the signal number in SIG.  */
 extern char *strsignal __P ((int __sig));