From 2a708128adc5e825471a3a63d6bc7a53005ae237 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Tue, 29 Apr 2003 21:27:59 +0000
Subject: 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.
---
 ChangeLog            |  6 ++++++
 configure.in         | 10 +++++++++-
 dbus/dbus-mainloop.c |  2 +-
 dbus/dbus.h          |  4 ++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 386c1ca8..a6257d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
-- 
cgit