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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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
 
@@ -55 +52 @@
         do { \
                 if (!(expr)) \
-                        assert_abort(#expr, __FILE__, STR2(__LINE__)); \
+                        assert_abort(#expr, __FILE__, __LINE__); \
         } while (0)
 
@@ -64 +61 @@
 #endif /* NDEBUG */
 
-extern void assert_abort(const char *, const char *, const char *)
+extern void assert_abort(const char *, const char *, unsigned int)
     __attribute__((noreturn));
-
 
 #endif