X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Futils%2Ftap.h;h=629c847c9306ad0ce8ff6c7254e711e73fbf4396;hp=96871a9040c61b91c8773ade68765d7beb4147bc;hb=HEAD;hpb=95720c6db3b4b2721c71fbb844b3f597fe4a81d0

diff --git a/tests/utils/tap.h b/tests/utils/tap.h
index 96871a9..966706f 100644
--- a/tests/utils/tap.h
+++ b/tests/utils/tap.h
@@ -9,30 +9,6 @@
 extern "C" {
 #endif
 
-/* '## __VA_ARGS__' is a gcc'ism. C99 doesn't allow the token pasting
-   and requires the caller to add the final comma if they've ommitted
-   the optional arguments */
-#ifdef __GNUC__
-# define ok(e, test, ...) ((e) ?					\
-			   _gen_result(1, __func__, __FILE__, __LINE__,	\
-				       test, ## __VA_ARGS__) :		\
-			   _gen_result(0, __func__, __FILE__, __LINE__,	\
-				       test, ## __VA_ARGS__))
-
-# define ok1(e) ((e) ?							\
-		 _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \
-		 _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
-
-# define pass(test, ...) ok(1, test, ## __VA_ARGS__)
-# define fail(test, ...) ok(0, test, ## __VA_ARGS__)
-
-# define skip_start(test, n, fmt, ...)			\
-	do {						\
-		if((test)) {				\
-			skip(n, fmt, ## __VA_ARGS__);	\
-			continue;			\
-		}
-#elif __STDC_VERSION__ >= 199901L /* __GNUC__ */
 # define ok(e, ...) ((e) ?						\
 		     _gen_result(1, __func__, __FILE__, __LINE__,	\
 				 __VA_ARGS__) :				\
@@ -52,9 +28,6 @@ extern "C" {
 			skip(n,  __VA_ARGS__);		\
 			continue;			\
 		}
-#else /* __STDC_VERSION__ */
-# error "Needs gcc or C99 compiler for variadic macros."
-#endif /* __STDC_VERSION__ */
 
 #define skip_end() } while(0);
 
@@ -68,7 +41,7 @@ __attribute__((format(TAP_PRINTF_FORMAT, 5, 6)))
 unsigned int _gen_result(int, const char *, const char *, unsigned int, const char *, ...);
 
 int plan_no_plan(void);
-__attribute__((noreturn))
+__attribute__((__noreturn__))
 int plan_skip_all(const char *);
 int plan_tests(unsigned int);