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

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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:

Merge mainline changes (needs fixes).

File:

• uspace/lib/c/include/assert.h (moved) (moved from uspace/lib/libc/include/assert.h ) (1 diff)

uspace/lib/c/include/assert.h

@@ -51 +51 @@
 
 #ifndef NDEBUG
-#       define assert(expr) if (!(expr)) { printf("Assertion failed (%s) at file '%s', line %d.\n", #expr, __FILE__, __LINE__); abort();}
-#else
-#       define assert(expr)
-#endif
+
+#define assert(expr) \
+        do { \
+                if (!(expr)) { \
+                        printf("Assertion failed (%s) at file '%s', " \
+                            "line %d.\n", #expr, __FILE__, __LINE__); \
+                        abort(); \
+                } \
+        } while (0)
+
+#else /* NDEBUG */
+
+#define assert(expr)
+
+#endif /* NDEBUG */
 
 #endif