bin: compile lttng-sessiond as C++

[lttng-tools.git] / tests / utils / tap / tap.h

diff --git a/tests/utils/tap/tap.h b/tests/utils/tap/tap.h
index 0f0594308ea27b20a207853bf7a05e1384b7d77b..84288f03848831f8f148c4612d9cd73608af8c75 100644 (file)
--- a/tests/utils/tap/tap.h
+++ b/tests/utils/tap/tap.h
@@ -1,7 +1,9 @@
 /*-
- * Copyright (c) 2004 Nik Clayton
+ * Copyright (C) 2004 Nik Clayton
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -24,6 +26,10 @@
  * SUCH DAMAGE.
  */
 
+#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 */
@@ -38,8 +44,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 {                                            \
@@ -58,8 +64,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 {                                            \
@@ -73,17 +79,21 @@
 
 #define skip_end() } while(0);
 
-unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...);
+unsigned int _gen_result(int, const char *, const char *, unsigned int, const char *, ...);
 
 int plan_no_plan(void);
 int plan_skip_all(char *);
 int plan_tests(unsigned int);
 
-unsigned int diag(char *, ...);
+unsigned int diag(const char *, ...);
 
-int skip(unsigned int, char *, ...);
+int skip(unsigned int, const char *, ...);
 
 void todo_start(char *, ...);
 void todo_end(void);
 
 int exit_status(void);
+
+#ifdef __cplusplus
+}
+#endif