Added _aprcall and did some gcc specific _syscall magic.

[minimal.git] / stdlib.h

diff --git a/stdlib.h b/stdlib.h
index 81033a33e892e0b4e1c00b504441433379acd0d3..bc3461d8dded8e9a4aefae063360be77d23a1c8d 100644 (file)
--- a/stdlib.h
+++ b/stdlib.h
@@ -60,15 +60,24 @@
         _assert_(#expr); \
     } while (false)
 
-#define _syscall(expr) \
-    do if ((long) (expr) != -1) \
+#define _syscall(expr) ({ \
+    __typeof__(expr) value; \
+    do if ((long) (value = (expr)) != -1) \
         break; \
     else switch (errno) { \
         case EINTR: \
             continue; \
         default: \
             _assert(false); \
-    } while (true)
+    } while (true); \
+    value; \
+})
+
+#define _aprcall(expr) \
+    do { \
+        apr_status_t status((expr)); \
+        _assert(status == APR_SUCCESS); \
+    } while (false)
 
 #define _forever \
     for (;;)