diff options
| -rw-r--r-- | cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 1 | ||||
| -rw-r--r-- | test/internals/printf.c | 1 | ||||
| -rw-r--r-- | test/internals/refs.c | 1 | ||||
| -rw-r--r-- | test/internals/syslog.c | 1 | ||||
| -rw-r--r-- | test/shell-test.c | 2 | ||||
| -rw-r--r-- | test/spawn-test.c | 2 | ||||
| -rw-r--r-- | test/test-utils.h | 4 |
8 files changed, 3 insertions, 11 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index bde43f03..32edc510 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -478,7 +478,7 @@ set(DBUS_INTERNAL_LIBRARIES dbus-internal) # important note: DBUS_INTERNAL_xxxxx_DEFINITIONS must *not* be set when building dbus-1 library set (DBUS_INTERNAL_ADD_LIBRARY_OPTIONS STATIC) set (DBUS_INTERNAL_LIBRARY_DEFINITIONS "-DDBUS_STATIC_BUILD") -set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_STATIC_BUILD") +set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_STATIC_BUILD -DDBUS_COMPILATION") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) diff --git a/test/Makefile.am b/test/Makefile.am index 8b2a5255..fe163c64 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -19,6 +19,7 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ static_cppflags = \ $(AM_CPPFLAGS) \ -DDBUS_STATIC_BUILD \ + -DDBUS_COMPILATION \ $(NULL) libdbus_testutils_la_CPPFLAGS = \ diff --git a/test/internals/printf.c b/test/internals/printf.c index 2d2fff8d..db151518 100644 --- a/test/internals/printf.c +++ b/test/internals/printf.c @@ -26,7 +26,6 @@ #include <config.h> -#define DBUS_COMPILATION /* this test uses libdbus-internal */ #include <dbus/dbus.h> #include <dbus/dbus-internals.h> #include <dbus/dbus-string.h> diff --git a/test/internals/refs.c b/test/internals/refs.c index db43a4da..202dc043 100644 --- a/test/internals/refs.c +++ b/test/internals/refs.c @@ -29,7 +29,6 @@ #include <glib.h> #include <glib-object.h> -#define DBUS_COMPILATION /* this test uses libdbus-internal */ #include <dbus/dbus.h> #include <dbus/dbus-connection-internal.h> #include <dbus/dbus-mainloop.h> diff --git a/test/internals/syslog.c b/test/internals/syslog.c index 658281cb..2811b757 100644 --- a/test/internals/syslog.c +++ b/test/internals/syslog.c @@ -30,7 +30,6 @@ #include <glib.h> -#define DBUS_COMPILATION /* this test uses libdbus-internal */ #include <dbus/dbus.h> #include <dbus/dbus-sysdeps.h> diff --git a/test/shell-test.c b/test/shell-test.c index b479a9c6..d1dc5b5b 100644 --- a/test/shell-test.c +++ b/test/shell-test.c @@ -1,7 +1,7 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#define DBUS_COMPILATION + #include <dbus/dbus-internals.h> #include <dbus/dbus-list.h> #include <dbus/dbus-memory.h> diff --git a/test/spawn-test.c b/test/spawn-test.c index f1a55051..e6513fa6 100644 --- a/test/spawn-test.c +++ b/test/spawn-test.c @@ -1,10 +1,8 @@ #include <config.h> #include <dbus/dbus.h> -#define DBUS_COMPILATION /* cheat and use dbus-sysdeps */ #include <dbus/dbus-sysdeps.h> #include <dbus/dbus-spawn.h> -#undef DBUS_COMPILATION #include <stdio.h> static void diff --git a/test/test-utils.h b/test/test-utils.h index 3e1e55e6..8d5357e1 100644 --- a/test/test-utils.h +++ b/test/test-utils.h @@ -1,14 +1,10 @@ #ifndef TEST_UTILS_H #define TEST_UTILS_H -#ifndef DBUS_COMPILATION -#define DBUS_COMPILATION /* Cheat and use private stuff */ -#endif #include <dbus/dbus.h> #include <stdio.h> #include <stdlib.h> #include <dbus/dbus-mainloop.h> #include <dbus/dbus-internals.h> -#undef DBUS_COMPILATION dbus_bool_t test_connection_setup (DBusLoop *loop, DBusConnection *connection); |