summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2009-01-15 06:03:00 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2009-01-15 06:03:00 (GMT)
commitf7afa46586645e50498d8b2d0c67884f014dc3a4 (patch)
tree6a17c55299cc217b43cd8a31176129d51c4e4d33
parentc0989fe7cb87e4dce7dbf2d4c338f3e4646df05a (diff)
downloadmonitoring-plugins-f7afa46586645e50498d8b2d0c67884f014dc3a4.tar.gz
Clean up last commit - remove the __STDC_VERSION__ check in tap.h
HP-UX refuses to compile tap with the check for __STDC_VERSION__ >= 199901L even though it can.
-rw-r--r--tap/tap.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/tap/tap.h b/tap/tap.h
index 346bd91..bd81789 100644
--- a/tap/tap.h
+++ b/tap/tap.h
@@ -47,7 +47,11 @@
47 skip(n, fmt, ## __VA_ARGS__); \ 47 skip(n, fmt, ## __VA_ARGS__); \
48 continue; \ 48 continue; \
49 } 49 }
50#else /*#elif __STDC_VERSION__ >= 199901L*/ /* __GNUC__ */ 50#else /* __GNUC__ */
51/* The original tap.h used to test if __STDC_VERSION__ >= 199901L here. This
52 * doesn't seem to work on HP-UX even though the code compile fine. I'm not
53 * sure how to add an exception here for HP-UX so I just removed the check
54 * for now */
51# define ok(e, ...) ((e) ? \ 55# define ok(e, ...) ((e) ? \
52 _gen_result(1, __func__, __FILE__, __LINE__, \ 56 _gen_result(1, __func__, __FILE__, __LINE__, \
53 __VA_ARGS__) : \ 57 __VA_ARGS__) : \
@@ -67,9 +71,7 @@
67 skip(n, __VA_ARGS__); \ 71 skip(n, __VA_ARGS__); \
68 continue; \ 72 continue; \
69 } 73 }
70/*#else *//* __STDC_VERSION__ */ 74#endif /* __GNUC__ */
71/*# error "Needs gcc or C99 compiler for variadic macros."*/
72#endif /* __STDC_VERSION__ */
73 75
74# define skip_end } while(0); 76# define skip_end } while(0);
75 77