diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2015-03-27 17:42:07 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2015-03-27 17:42:07 +0300 |
commit | 0c9ed253893faa13313fee30ce6dbf40a0339035 (patch) | |
tree | 488b25b9c65c93011c75eb09035db2d5ee2f400f /bus/test.c | |
parent | 6a2ee6bd4acd68ec4f28fa397543079d8cab77cc (diff) | |
parent | c1c801dcb5e6470e9327195c89ee2da6e505127b (diff) | |
download | dbus-0c9ed253893faa13313fee30ce6dbf40a0339035.tar.gz |
Merge branch 'master' of git://anonscm.debian.org/pkg-utopia/dbus
Conflicts:
debian/changelog
debian/dbus.postinst
Diffstat (limited to 'bus/test.c')
-rw-r--r-- | bus/test.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -23,7 +23,7 @@ #include <config.h> -#ifdef DBUS_BUILD_TESTS +#ifdef DBUS_ENABLE_EMBEDDED_TESTS #include "test.h" #include <dbus/dbus-internals.h> #include <dbus/dbus-list.h> |