Changes in uspace/lib/c/include/str.h [bc56f30:1c9bf292] in mainline

File:

• uspace/lib/c/include/str.h (modified) (5 diffs)

uspace/lib/c/include/str.h

@@ -38 +38 @@
 #define _LIBC_STR_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <errno.h>
 #include <stdbool.h>
@@ -44 +48 @@
 
 #include <mem.h>
-#include <_bits/decls.h>
-
-#ifndef __cplusplus
 
 /* Common Unicode characters */
@@ -62 +63 @@
  */
 #define SPASCII_STR_BUFSIZE(spa_size) ((spa_size) + 1)
-
-#endif
-
-__HELENOS_DECLS_BEGIN;
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
@@ -137 +134 @@
 extern errno_t str_size_t(const char *, const char **, unsigned int, bool,
     size_t *);
-extern int str_int64_t(const char *, const char **, unsigned int, bool,
+extern errno_t str_int64_t(const char *, const char **, unsigned int, bool,
     int64_t *);
 
@@ -150 +147 @@
 extern unsigned long strtoul(const char *, char **, int);
 
-__HELENOS_DECLS_END;
+#ifdef __cplusplus
+}
+#endif
 
 #endif