Changes in uspace/lib/c/include/string.h [bc56f30:3875f106] in mainline

File:

• uspace/lib/c/include/string.h (modified) (2 diffs)

uspace/lib/c/include/string.h

@@ -33 +33 @@
  */
 
-#ifndef _LIBC_STRING_H_
-#define _LIBC_STRING_H_
+#ifndef LIBC_STRING_H_
+#define LIBC_STRING_H_
 
-#if defined(_HELENOS_SOURCE) && !defined(_REALLY_WANT_STRING_H) && \
-    !defined(_LIBC_SOURCE)
+#if defined(_HELENOS_SOURCE) && !defined(_REALLY_WANT_STRING_H)
 #error Please use str.h and mem.h instead
 #endif
 
-#include <_bits/decls.h>
 #include <_bits/size_t.h>
 #include <_bits/NULL.h>
 #include <mem.h>
-
-__C_DECLS_BEGIN;
 
 extern char *strcpy(char *, const char *);
@@ -67 +63 @@
 extern size_t strlen(const char *);
 
-#if defined(_HELENOS_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_LIBC_SOURCE)
-extern size_t strnlen(const char *, size_t);
-extern char *strdup(const char *);
-extern char *strndup(const char *, size_t);
-#endif
-
-__C_DECLS_END;
-
 #endif