X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Futils%2Ftap.h;h=96871a9040c61b91c8773ade68765d7beb4147bc;hp=39312fcb2e5a4b425b803a2c68c8f782cb4df93d;hb=95720c6db3b4b2721c71fbb844b3f597fe4a81d0;hpb=ed545d364011eed865cc051e7afe8ccf10ac64e9

diff --git a/tests/utils/tap.h b/tests/utils/tap.h
index 39312fc..96871a9 100644
--- a/tests/utils/tap.h
+++ b/tests/utils/tap.h
@@ -5,6 +5,10 @@
  * Copyright (C) 2017 Jérémie Galarneau
  */
 
+#ifdef __cplusplus
+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 */
@@ -19,8 +23,8 @@
 		 _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 pass(test, ...) ok(1, test, ## __VA_ARGS__)
+# define fail(test, ...) ok(0, test, ## __VA_ARGS__)
 
 # define skip_start(test, n, fmt, ...)			\
 	do {						\
@@ -39,8 +43,8 @@
 		 _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 pass(...) ok(1, __VA_ARGS__)
+# define fail(...) ok(0, __VA_ARGS__)
 
 # define skip_start(test, n, ...)			\
 	do {						\
@@ -87,3 +91,7 @@ unsigned int rdiag_start(void);
 __attribute__((format(TAP_PRINTF_FORMAT, 1, 2)))
 unsigned int rdiag(const char *fmt, ...);
 unsigned int rdiag_end(void);
+
+#ifdef __cplusplus
+}
+#endif