summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2006-10-17 21:04:12 +0000
committerHavoc Pennington <hp@redhat.com>2006-10-17 21:04:12 +0000
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 71820890..1efc6a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
12006-10-17 Havoc Pennington <hp@redhat.com> 12006-10-17 Havoc Pennington <hp@redhat.com>
2 2
3 * configure.in (CPPFLAGS): don't do -DDBUS_API_SUBJECT_TO_CHANGE here
4
5 * dbus/dbus.h: drop the DBUS_API_SUBJECT_TO_CHANGE requirement,
6 since realistically it doesn't look like we'll be changing it
7 anymore.
8
92006-10-17 Havoc Pennington <hp@redhat.com>
10
3 * dbus/dbus-internals.c (_dbus_warn_check_failed): new function to 11 * dbus/dbus-internals.c (_dbus_warn_check_failed): new function to
4 be used for return_if_fail type warnings; prefixes the pid, and 12 be used for return_if_fail type warnings; prefixes the pid, and
5 fatal by default. 13 fatal by default.
diff --git a/configure.in b/configure.in
index 73fe6d8d..c770dae1 100644
--- a/configure.in
+++ b/configure.in
@@ -246,8 +246,6 @@ esac
246AM_PROG_LIBTOOL 246AM_PROG_LIBTOOL
247 247
248changequote(,)dnl 248changequote(,)dnl
249# let ourselves use our own unstable API
250CPPFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE=1 $CPPFLAGS"
251# compress spaces in flags 249# compress spaces in flags
252CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'` 250CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'`
253CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ +/ /g'` 251CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ +/ /g'`
diff --git a/dbus/dbus.h b/dbus/dbus.h
index 4e11f7b8..ac1287e8 100644
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -26,10 +26,6 @@
26 26
27#define DBUS_INSIDE_DBUS_H 1 27#define DBUS_INSIDE_DBUS_H 1
28 28
29#ifndef DBUS_API_SUBJECT_TO_CHANGE
30#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."
31#endif
32
33#include <dbus/dbus-arch-deps.h> 29#include <dbus/dbus-arch-deps.h>
34#include <dbus/dbus-address.h> 30#include <dbus/dbus-address.h>
35#include <dbus/dbus-bus.h> 31#include <dbus/dbus-bus.h>