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

Timestamp:

2011-05-21T16:23:17Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ff03f3

Parents:

8d308b9 (diff), 13f2461 (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.

File:

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

uspace/lib/c/include/assert.h

@@ -47 +47 @@
  */
 
+#define STR(l)  #l
+#define STR2(l) STR(l)
+
 #ifndef NDEBUG
 
@@ -52 +55 @@
         do { \
                 if (!(expr)) \
-                        assert_abort(#expr, __FILE__, __LINE__); \
+                        assert_abort(#expr, __FILE__, STR2(__LINE__)); \
         } while (0)
 
@@ -61 +64 @@
 #endif /* NDEBUG */
 
-extern void assert_abort(const char *, const char *, unsigned int)
+extern void assert_abort(const char *, const char *, const char *)
     __attribute__((noreturn));
+
 
 #endif