Merge branch 'master' of git://git.lttng.org/lttng-tools
authorDavid Goulet <dgoulet@efficios.com>
Tue, 21 Feb 2012 22:53:02 +0000 (17:53 -0500)
committerDavid Goulet <dgoulet@efficios.com>
Tue, 21 Feb 2012 22:53:02 +0000 (17:53 -0500)
src/common/error.h

index 81c20223d124282b59bb8ea23801cd714156f441..14b5e7c67ea1eda8f519f2cfe42a48cd32a3a7ca 100644 (file)
@@ -77,12 +77,27 @@ extern int opt_verbose;
 #define _PERROR(fmt, args...) \
        __lttng_print(PRINT_ERR, "perror " fmt "\n", ## args)
 
+#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+/*
+ * Version using XSI strerror_r.
+ */
+#define PERROR(call, args...) \
+       do { \
+               char buf[200]; \
+               strerror_r(errno, buf, sizeof(buf)); \
+               _PERROR(call ": %s", ## args, buf); \
+       } while(0);
+#else
+/*
+ * Version using GNU strerror_r, for linux with appropriate defines.
+ */
 #define PERROR(call, args...) \
-    do { \
+       do { \
                char *buf; \
                char tmp[200]; \
                buf = strerror_r(errno, tmp, sizeof(tmp)); \
                _PERROR(call ": %s", ## args, buf); \
        } while(0);
+#endif
 
 #endif /* _ERROR_H */
This page took 0.032948 seconds and 4 git commands to generate.