Changeset 39457 for trunk/Ohana/src/libtap/include/tap_ohana.h

Timestamp:

Mar 11, 2016, 10:23:42 PM (10 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libtap/include/tap_ohana.h (modified) (2 diffs)

trunk/Ohana/src/libtap/include/tap_ohana.h

@@ -28 +28 @@
    and requires the caller to add the final comma if they've ommitted
    the optional arguments */
-#ifdef __GNUC__
+#if __STDC_VERSION__ >= 199901L /* we are C99 */
+# define ok(e, ...) ((e) ?                                              \
+                     _gen_result(1, __func__, __FILE__, __LINE__,       \
+                                 __VA_ARGS__) :                         \
+                     _gen_result(0, __func__, __FILE__, __LINE__,       \
+                                 __VA_ARGS__))
+
+# define ok1(e) ((e) ?                                                  \
+                 _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \
+                 _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
+
+# define pass(...) ok(1, __VA_ARGS__);
+# define fail(...) ok(0, __VA_ARGS__);
+
+# define skip_start(test, n, ...)                       \
+        do {                                            \
+                if((test)) {                            \
+                        skip(n,  __VA_ARGS__);          \
+                        continue;                       \
+                }
+#elif __GNUC__ /* we are at least gcc */
 # define ok(e, test, ...) ((e) ?                                        \
                            _gen_result(1, __func__, __FILE__, __LINE__, \
@@ -48 +68 @@
                         continue;                       \
                 }
-#elif __STDC_VERSION__ >= 199901L /* __GNUC__ */
-# define ok(e, ...) ((e) ?                                              \
-                     _gen_result(1, __func__, __FILE__, __LINE__,       \
-                                 __VA_ARGS__) :                         \
-                     _gen_result(0, __func__, __FILE__, __LINE__,       \
-                                 __VA_ARGS__))
-
-# define ok1(e) ((e) ?                                                  \
-                 _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \
-                 _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
-
-# define pass(...) ok(1, __VA_ARGS__);
-# define fail(...) ok(0, __VA_ARGS__);
-
-# define skip_start(test, n, ...)                       \
-        do {                                            \
-                if((test)) {                            \
-                        skip(n,  __VA_ARGS__);          \
-                        continue;                       \
-                }
-#else /* __STDC_VERSION__ */
+#else /* neither __STDC_VERSION__ nor gcc: */
 # error "Needs gcc or C99 compiler for variadic macros."
 #endif /* __STDC_VERSION__ */