X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.h;h=fc06b4ace4d7a058d481d1a8ecec519b07ae5bce;hb=0159fa50ebb4c8ea0e34a24f99bc8f5cda298be4;hp=48f937b1b71a9924b33d8201828421fc3a9b122d;hpb=d23253aed60c9aaea2adcc689a7fbefc22b43e7b;p=lttng-tools.git

diff --git a/tests/utils/utils.h b/tests/utils/utils.h
index 48f937b1b..fc06b4ace 100644
--- a/tests/utils/utils.h
+++ b/tests/utils/utils.h
@@ -8,27 +8,32 @@
 #ifndef TEST_UTILS_H
 #define TEST_UTILS_H
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
 
 /*
  * Version using XSI strerror_r.
  */
-#define PERROR_NO_LOGGER(msg, args...)                      \
-	do {                                                \
-		char buf[200];                              \
-		strerror_r(errno, buf, sizeof(buf));        \
-		fprintf(stderr, msg ": %s\n", ##args, buf); \
+#define PERROR_NO_LOGGER(msg, args...)                               \
+	do {                                                         \
+		char _perror_buf[200];                               \
+		strerror_r(errno, _perror_buf, sizeof(_perror_buf)); \
+		fprintf(stderr, msg ": %s\n", ##args, _perror_buf);  \
 	} while (0);
 #else
 /*
  * Version using GNU strerror_r, for linux with appropriate defines.
  */
-#define PERROR_NO_LOGGER(msg, args...)                      \
-	do {                                                \
-		char *buf;                                  \
-		char tmp[200];                              \
-		buf = strerror_r(errno, tmp, sizeof(tmp));  \
-		fprintf(stderr, msg ": %s\n", ##args, buf); \
+#define PERROR_NO_LOGGER(msg, args...)                                    \
+	do {                                                              \
+		char *_perror_buf;                                        \
+		char _perror_tmp[200];                                    \
+		_perror_buf = strerror_r(                                 \
+				errno, _perror_tmp, sizeof(_perror_tmp)); \
+		fprintf(stderr, msg ": %s\n", ##args, _perror_buf);       \
 	} while (0);
 #endif
 
@@ -36,4 +41,8 @@ int usleep_safe(useconds_t usec);
 int create_file(const char *path);
 int wait_on_file(const char *path);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* TEST_UTILS_H */