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

uspace/lib/c/include/assert.h

@@ -38 +38 @@
 // This is in accordance with the C standard.
 
-#ifndef LIBC_ASSERT_H_
-#define LIBC_ASSERT_H_
+#ifndef _LIBC_ASSERT_H_
+#define _LIBC_ASSERT_H_
+
+#include <_bits/decls.h>
 
 #ifndef __cplusplus
 #define static_assert _Static_assert
 #endif
+
+__C_DECLS_BEGIN;
 
 extern void __helenos_assert_abort(const char *, const char *, unsigned int)
@@ -50 +54 @@
 extern void __helenos_assert_quick_abort(const char *, const char *, unsigned int)
     __attribute__((noreturn));
+
+__C_DECLS_END;
 
 #endif