diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | dbus/dbus-mainloop.c | 2 | ||||
| -rw-r--r-- | dbus/dbus.h | 4 |
4 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2003-04-29 Havoc Pennington <hp@redhat.com> + + * dbus/dbus.h: add "you have to define DBUS_API_SUBJECT_TO_CHANGE + to use this library" to be sure people have the right + expectations. + 2003-04-28 Havoc Pennington <hp@redhat.com> * configure.in: add --enable-docs which by default is auto yes if diff --git a/configure.in b/configure.in index abb309c5..07830d90 100644 --- a/configure.in +++ b/configure.in @@ -132,8 +132,14 @@ else fi fi -# compress spaces in cflags +changequote(,)dnl +# let ourselves use our own unstable API +CPPFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE=1 $CPPFLAGS" +# compress spaces in flags CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'` +CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ +/ /g'` +CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ +/ /g'` +changequote([,])dnl if test x$enable_gcov = xyes; then ## so that config.h changes when you toggle gcov support @@ -607,6 +613,8 @@ echo " source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} + cppflags: ${CPPFLAGS} + cxxflags: ${CXXFLAGS} Doxygen: ${DOXYGEN} db2html: ${DB2HTML} diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c index 43e0788d..04c8f1de 100644 --- a/dbus/dbus-mainloop.c +++ b/dbus/dbus-mainloop.c @@ -636,7 +636,7 @@ _dbus_loop_iterate (DBusLoop *loop, timeout = MIN (msecs_remaining, timeout); #if MAINLOOP_SPEW - _dbus_verbose (" timeout added, %d remaining, aggregate timeout %d\n", + _dbus_verbose (" timeout added, %d remaining, aggregate timeout %ld\n", msecs_remaining, timeout); #endif diff --git a/dbus/dbus.h b/dbus/dbus.h index 4285b395..d7fec9b9 100644 --- a/dbus/dbus.h +++ b/dbus/dbus.h @@ -26,6 +26,10 @@ #define DBUS_INSIDE_DBUS_H 1 +#ifndef DBUS_API_SUBJECT_TO_CHANGE +#error "Please define DBUS_API_SUBJECT_TO_CHANGE to acknowledge your understanding that D-BUS hasn't reached 1.0 and is subject to protocol and API churn. That said, you are encouraged to use it and we are actively fixing bugs and believe it to be functional." +#endif + #include <dbus/dbus-arch-deps.h> #include <dbus/dbus-address.h> #include <dbus/dbus-bus.h> |