Changeset eb522e8 in mainline for uspace/lib/c/include/assert.h

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

uspace/lib/c/include/assert.h

@@ -40 +40 @@
  *
  * If NDEBUG is not set, the assert() macro
- * evaluates expr and if it is false prints 
+ * evaluates expr and if it is false prints
  * error message and terminate program.
  *
@@ -47 +47 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#ifndef NDEBUG
 
-#ifndef NDEBUG
-#       define assert(expr) \
-                do { \
-                        if (!(expr)) { \
-                                printf("Assertion failed (%s) at file '%s', " \
-                                    "line %d.\n", #expr, __FILE__, __LINE__); \
-                                abort(); \
-                        } \
-                } while (0)
-#else
-#       define assert(expr)
-#endif
+#define assert(expr) \
+        do { \
+                if (!(expr)) \
+                        assert_abort(#expr, __FILE__, __LINE__); \
+        } while (0)
+
+#else /* NDEBUG */
+
+#define assert(expr)
+
+#endif /* NDEBUG */
+
+extern void assert_abort(const char *, const char *, unsigned int)
+    __attribute__((noreturn));
 
 #endif