--- Libc/Libc-391.2.6/include/strings.h
+++ Libc/Libc-498/include/strings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2007 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -55,7 +55,9 @@
  *	@(#)strings.h	8.1 (Berkeley) 6/2/93
  */
 
-#if !defined(_XOPEN_SOURCE) && !defined(_POSIX_C_SOURCE)
+#include <sys/cdefs.h>
+
+#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE)
 
 #include <string.h>
 
@@ -68,6 +70,7 @@
 typedef	__darwin_size_t	size_t;
 #endif
 
+__BEGIN_DECLS
 int      bcmp(const void *, const void *, size_t);
 void     bcopy(const void *, void *, size_t);
 void     bzero(void *, size_t);
@@ -76,6 +79,7 @@
 char    *rindex(const char *, int); 
 int      strcasecmp(const char *, const char *);
 int      strncasecmp(const char *, const char *, size_t);
+__END_DECLS
 
-#endif  /* _POSIX_C_SOURCE */
+#endif  /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */