From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 14 Sep 2021 18:13:37 +0000 (-0400)
Subject: Cleanup: Tests: Remove useless pre-C99 compatibility code from tap.h
X-Git-Tag: v0.14.0~46
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=fde3e8b3d540156b58c73bc4683c31285c480903;p=userspace-rcu.git

Cleanup: Tests: Remove useless pre-C99 compatibility code from tap.h

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I02488c88013f6a7c60205219d15850ef8b04271e
---

diff --git a/tests/utils/tap.h b/tests/utils/tap.h
index 96871a9..629c847 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);