Changeset bc73be3 in mainline for uspace/lib/c/include/string.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• uspace/lib/c/include/string.h (modified) (4 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) && \
@@ -41 +41 @@
 #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 *);
@@ -64 +67 @@
 extern size_t strlen(const char *);
 
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_LIBC_SOURCE)
+#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 *);
@@ -70 +73 @@
 #endif
 
+__C_DECLS_END;
+
 #endif