summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2006-10-17 21:04:12 (GMT)
committerHavoc Pennington <hp@redhat.com>2006-10-17 21:04:12 (GMT)
commita947713c354462d1235e6ef3d8d3929bf9f080d4 (patch)
treeafa236cd4fc617591b4cc59da7720797c2c1e08f
parentf1ca9b89e92de4d876dc5e7e85710c4d2dc87638 (diff)
2006-10-17 Havoc Pennington <hp@redhat.com>
* configure.in (CPPFLAGS): don't do -DDBUS_API_SUBJECT_TO_CHANGE here * dbus/dbus.h: drop the DBUS_API_SUBJECT_TO_CHANGE requirement, since realistically it doesn't look like we'll be changing it anymore.
-rw-r--r--ChangeLog8
-rw-r--r--configure.in2
-rw-r--r--dbus/dbus.h4
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7182089..1efc6a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-10-17 Havoc Pennington <hp@redhat.com>
+ * configure.in (CPPFLAGS): don't do -DDBUS_API_SUBJECT_TO_CHANGE here
+
+ * dbus/dbus.h: drop the DBUS_API_SUBJECT_TO_CHANGE requirement,
+ since realistically it doesn't look like we'll be changing it
+ anymore.
+
+2006-10-17 Havoc Pennington <hp@redhat.com>
+
* dbus/dbus-internals.c (_dbus_warn_check_failed): new function to
be used for return_if_fail type warnings; prefixes the pid, and
fatal by default.
diff --git a/configure.in b/configure.in
index 73fe6d8..c770dae 100644
--- a/configure.in
+++ b/configure.in
@@ -246,8 +246,6 @@ esac
AM_PROG_LIBTOOL
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'`
diff --git a/dbus/dbus.h b/dbus/dbus.h
index 4e11f7b..ac1287e 100644
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -26,10 +26,6 @@
#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. See the README for a full explanation."
-#endif
-
#include <dbus/dbus-arch-deps.h>
#include <dbus/dbus-address.h>
#include <dbus/dbus-bus.h>