projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: don't use GNU old-style field designator extension
[lttng-ust.git]
/
include
/
usterr.h
diff --git
a/include/usterr.h
b/include/usterr.h
index 86c9bf866a256dcff7f2b2ae6bf9893381db702a..dc151b0aae2002504422d705966416fe5868f619 100644
(file)
--- a/
include/usterr.h
+++ b/
include/usterr.h
@@
-22,7
+22,6
@@
#include <string.h>
#include <sys/types.h>
#include <string.h>
#include <sys/types.h>
-#include <sys/syscall.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
@@
-87,7
+86,10
@@
static inline int ust_debug(void)
#define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
#define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
#define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
#define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)
+#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] = "Error in strerror_r()"; \
#define PERROR(call, args...)\
do { \
char buf[200] = "Error in strerror_r()"; \
@@
-95,6
+97,9
@@
static inline int ust_debug(void)
ERRMSG("Error: " call ": %s", ## args, buf); \
} while(0);
#else
ERRMSG("Error: " call ": %s", ## args, buf); \
} while(0);
#else
+/*
+ * Version using GNU strerror_r, for linux with appropriate defines.
+ */
#define PERROR(call, args...)\
do { \
char *buf; \
#define PERROR(call, args...)\
do { \
char *buf; \
This page took
0.025016 seconds
and
4
git commands to generate.