Changeset bc73be3 in mainline for uspace/lib/c/include/time.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/time.h (modified) (6 diffs)

uspace/lib/c/include/time.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_TIME_H_
-#define LIBC_TIME_H_
+#ifndef _LIBC_TIME_H_
+#define _LIBC_TIME_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <_bits/decls.h>
 
 /* ISO/IEC 9899:2011 7.27.1 (2) */
@@ -52 +50 @@
 #include <_bits/size_t.h>
 
+__C_DECLS_BEGIN;
+
 /* ISO/IEC 9899:2011 7.27.1 (3), (4) */
 
@@ -64 +64 @@
 struct tm {
         int tm_sec;
-#ifdef _HELENOS_SOURCE
-        int tm_nsec;
-#endif
+        int tm_nsec;  /**< Nonstandard extension, nanoseconds since last second. */
         int tm_min;
         int tm_hour;
@@ -108 +106 @@
     const struct tm *__restrict__);
 
+__C_DECLS_END;
+
 #ifdef _HELENOS_SOURCE
 
@@ -116 +116 @@
 #include <stdbool.h>
 #include <_bits/errno.h>
+
+__HELENOS_DECLS_BEGIN;
 
 typedef long long sec_t;
@@ -157 +159 @@
 extern void udelay(sysarg_t);
 
+__HELENOS_DECLS_END;
+
 #endif /* _HELENOS_SOURCE */
-
-#ifdef __cplusplus
-}
-#endif
 
 #endif