Merge branch 'incoming'

1 files changed, 27 insertions, 27 deletions

diff --git a/system/include/libc/strings.h b/system/include/libc/strings.h
index 131d81d2..2b7e086c 100644
--- a/system/include/libc/strings.h
+++ b/system/include/libc/strings.h
@@ -1,35 +1,35 @@
-/*
- * strings.h
- *
- * Definitions for string operations.
- */
+#ifndef	_STRINGS_H
+#define	_STRINGS_H
 
-#ifndef _STRINGS_H_
-#define _STRINGS_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "_ansi.h"
-#include <sys/reent.h>
 
-#include <sys/types.h> /* for size_t */
+#define __NEED_size_t
+#define __NEED_locale_t
+#include <bits/alltypes.h>
 
-_BEGIN_STD_C
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_SOURCE) \
+ || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE+0 < 200809L) \
+ || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
+int bcmp (const void *, const void *, size_t);
+void bcopy (const void *, void *, size_t);
+void bzero (void *, size_t);
+char *index (const char *, int);
+char *rindex (const char *, int);
+#endif
 
-#if !defined __STRICT_ANSI__ && _POSIX_VERSION < 200809L
-/* 
- * Marked LEGACY in Open Group Base Specifications Issue 6/IEEE Std 1003.1-2004
- * Removed from Open Group Base Specifications Issue 7/IEEE Std 1003.1-2008
- */
-int	 _EXFUN(bcmp,(const void *, const void *, size_t));
-void	 _EXFUN(bcopy,(const void *, void *, size_t));
-void	 _EXFUN(bzero,(void *, size_t));
-char 	*_EXFUN(index,(const char *, int));
-char 	*_EXFUN(rindex,(const char *, int));
-#endif /* ! __STRICT_ANSI__ */
+int ffs (int);
 
-int	 _EXFUN(ffs,(int));
-int	 _EXFUN(strcasecmp,(const char *, const char *));
-int	 _EXFUN(strncasecmp,(const char *, const char *, size_t));
+int strcasecmp (const char *, const char *);
+int strncasecmp (const char *, const char *, size_t);
 
-_END_STD_C
+int strcasecmp_l (const char *, const char *, locale_t);
+int strncasecmp_l (const char *, const char *, size_t, locale_t);
 
-#endif /* _STRINGS_H_ */
+#ifdef __cplusplus
+}
+#endif
+
+#endif