Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
AFBClient: add license headers
[staging/windowmanager.git]
/
src
/
util.hpp
diff --git
a/src/util.hpp
b/src/util.hpp
index
5d602ed
..
b3f43de
100644
(file)
--- a/
src/util.hpp
+++ b/
src/util.hpp
@@
-23,9
+23,11
@@
#include <sys/poll.h>
#include <sys/poll.h>
+#ifndef DO_NOT_USE_AFB
extern "C" {
#include <afb/afb-binding.h>
};
extern "C" {
#include <afb/afb-binding.h>
};
+#endif
#define CONCAT_(X, Y) X##Y
#define CONCAT(X, Y) CONCAT_(X, Y)
#define CONCAT_(X, Y) X##Y
#define CONCAT(X, Y) CONCAT_(X, Y)
@@
-39,6
+41,7
@@
extern "C" {
#define ATTR_NORETURN
#endif
#define ATTR_NORETURN
#endif
+#ifdef AFB_BINDING_VERSION
#define lognotice(...) AFB_NOTICE(__VA_ARGS__)
#define logerror(...) AFB_ERROR(__VA_ARGS__)
#define fatal(...) \
#define lognotice(...) AFB_NOTICE(__VA_ARGS__)
#define logerror(...) AFB_ERROR(__VA_ARGS__)
#define fatal(...) \
@@
-46,12
+49,24
@@
extern "C" {
AFB_ERROR(__VA_ARGS__); \
abort(); \
} while (0)
AFB_ERROR(__VA_ARGS__); \
abort(); \
} while (0)
+#else
+#define lognotice(...)
+#define logerror(...)
+#define fatal(...) \
+ do { \
+ abort(); \
+ } while (0)
+#endif
#ifdef DEBUG_OUTPUT
#ifdef DEBUG_OUTPUT
+#ifdef AFB_BINDING_VERSION
#define logdebug(...) AFB_DEBUG(__VA_ARGS__)
#else
#define logdebug(...)
#endif
#define logdebug(...) AFB_DEBUG(__VA_ARGS__)
#else
#define logdebug(...)
#endif
+#else
+#define logdebug(...)
+#endif
#ifndef SCOPE_TRACING
#define ST()
#ifndef SCOPE_TRACING
#define ST()