Changeset 432a269 in mainline for uspace/lib/posix/assert.h

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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/posix/assert.h (moved) (moved from uspace/lib/c/include/ns_obsolete.h ) (2 diffs)

uspace/lib/posix/assert.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2011 Jiri Zarevucky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libposix
  * @{
  */
-/** @file
+/** @file Program assertion.
  */
 
-#ifndef LIBC_NS_OBSOLETE_H_
-#define LIBC_NS_OBSOLETE_H_
+/* NO include guard on purpose. */
 
-#include <sys/types.h>
-#include <task.h>
+#include "libc/assert.h"
 
-extern int service_obsolete_connect(sysarg_t, sysarg_t, sysarg_t);
-extern int service_obsolete_connect_blocking(sysarg_t, sysarg_t,
-    sysarg_t);
+#undef assert
 
+#ifndef NDEBUG
+        #define assert(expr) ((expr) ? (void) 0 : assert_abort(#expr, __FILE__, __LINE__))
+#else
+        #define assert(expr) ((void) 0)
 #endif