X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tests%2Futils%2Ftap%2Ftap.h;h=76e70230b462cf5b715735aff141883a1e4d7929;hb=6244258c549b206646f2d351281643527c92bc65;hp=190c4a942b42c10ba1a7684131c5993699e3a41d;hpb=830153f4e91a4e50e831c2776994fc20ac89970e;p=babeltrace.git

diff --git a/tests/utils/tap/tap.h b/tests/utils/tap/tap.h
index 190c4a94..76e70230 100644
--- a/tests/utils/tap/tap.h
+++ b/tests/utils/tap/tap.h
@@ -1,30 +1,14 @@
-/*-
- * Copyright (c) 2004 Nik Clayton
- *               2017 Jérémie Galarneau
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * Copyright (C) 2004 Nik Clayton
+ * 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 */
@@ -75,27 +59,32 @@
 #define skip_end() } while(0);
 
 #ifdef __MINGW_PRINTF_FORMAT
-# define PRINT_FORMAT __MINGW_PRINTF_FORMAT
+# define TAP_PRINTF_FORMAT __MINGW_PRINTF_FORMAT
 #else
-# define PRINT_FORMAT printf
+# define TAP_PRINTF_FORMAT printf
 #endif
 
-__attribute__((format(PRINT_FORMAT, 5, 6)))
+__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))
 int plan_skip_all(const char *);
 int plan_tests(unsigned int);
 
-__attribute__((format(PRINT_FORMAT, 1, 2)))
+__attribute__((format(TAP_PRINTF_FORMAT, 1, 2)))
 unsigned int diag(const char *, ...);
 void diag_multiline(const char *);
 
-__attribute__((format(PRINT_FORMAT, 2, 3)))
+__attribute__((format(TAP_PRINTF_FORMAT, 2, 3)))
 int skip(unsigned int, const char *, ...);
 
-__attribute__((format(PRINT_FORMAT, 1, 2)))
+__attribute__((format(TAP_PRINTF_FORMAT, 1, 2)))
 void todo_start(const char *, ...);
 void todo_end(void);
 
 int exit_status(void);
+
+#ifdef __cplusplus
+}
+#endif