Merge strings.h into string.h.

libc/include/string.h

@@ -42,6 +42,7 @@ void* memmove(void*, const void*, size_t);
 void* memset(void*, int, size_t);
 char* stpcpy(char* __restrict, const char* __restrict);
 char* stpncpy(char* __restrict, const char* __restrict, size_t);
+int strcasecmp(const char* a, const char* b);
 char* strcat(char* __restrict, const char* __restrict);
 char* strchr(const char*, int);
 int strcmp(const char*, const char*);
@@ -54,6 +55,7 @@ int strerror_r(int, char*, size_t);
 size_t strlcat(char* __restrict, const char* __restrict, size_t);
 size_t strlcpy(char* __restrict, const char* __restrict, size_t);
 size_t strlen(const char*);
+int strncasecmp(const char* a, const char* b, size_t n);
 char* strncat(char* __restrict, const char* __restrict, size_t);
 int strncmp(const char*, const char*, size_t);
 char* strncpy(char* __restrict, const char* __restrict, size_t);

libc/include/strings.h

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    Copyright(C) Jonas 'Sortie' Termansen 2011.
+    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
 
     This file is part of the Sortix C Library.
 
@@ -18,23 +18,15 @@
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
     strings.h
-    String operations.
+    Deprecated header providing previously non-standard functions that have now
+    either been obsoleted or merged into string.h.
 
 *******************************************************************************/
 
-#ifndef _STRINGS_H
-#define _STRINGS_H 1
+#ifndef INCLUDE_STRINGS_H
+#define INCLUDE_STRINGS_H
 
-#include <features.h>
-
-__BEGIN_DECLS
-
-@include(size_t.h)
-@include(locale_t.h)
-
-int strcasecmp(const char* a, const char* b);
-int strncasecmp(const char* a, const char* b, size_t n);
-
-__END_DECLS
+/* Simply include the standard header that will provide the functions. */
+#include <string.h>
 
 #endif