diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-10-02 18:45:27 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-10-02 18:45:27 +0000 |
| commit | ff99239bd429cb3335406dff1761a0a54ad2996b (patch) | |
| tree | 31d3551bdf13402efa9047bd7b87cbaaa023bf0a | |
| parent | 254524928ac070b59c8a3a089df2279f0021a7cf (diff) | |
* dbus/dbus-sysdeps.c (_dbus_abort): Remove from
#ifndef DBUS_DISABLE_ASSERTS macro to fix distcheck
* dbus/dbus-sysdeps-unix.c (_dbus_print_backtrace): Remove from
#if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_BUILD_TESTS)
macro because _dbus_abort calls it
* tools/Makefile.am: Add dbus-launch.h to the source list so distcheck works
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.c | 3 | ||||
| -rw-r--r-- | tools/Makefile.am | 3 |
5 files changed, 16 insertions, 6 deletions
@@ -1,5 +1,17 @@ 2006-10-02 John (J5) Palmieir <johnp@redhat.com> + * dbus/dbus-sysdeps.c (_dbus_abort): Remove from + #ifndef DBUS_DISABLE_ASSERTS macro to fix distcheck + + * dbus/dbus-sysdeps-unix.c (_dbus_print_backtrace): Remove from + #if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_BUILD_TESTS) + macro because _dbus_abort calls it + + * tools/Makefile.am: Add dbus-launch.h to the source list so distcheck + works + +2006-10-02 John (J5) Palmieir <johnp@redhat.com> + * dbus/dbus-sysdeps-util-unix.c (dirent_buf_size): Add check for MAXNAMELEN for Mac OSX. (Patch from Jonas B <sanoix at gmail dot com>) diff --git a/configure.in b/configure.in index 1be4a96c..b3a50ecb 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(dbus/dbus.h) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(dbus, 0.94) +AM_INIT_AUTOMAKE(dbus, 0.93.1) AM_CONFIG_HEADER(config.h) diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 22ef9969..ce565884 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -2127,7 +2127,6 @@ _dbus_set_fd_nonblocking (int fd, return TRUE; } -#if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_BUILD_TESTS) /** * On GNU libc systems, print a crude backtrace to stderr. On other * systems, print "no backtrace support" and block for possible gdb @@ -2162,7 +2161,6 @@ _dbus_print_backtrace (void) fprintf (stderr, " D-Bus not compiled with backtrace support so unable to print a backtrace\n"); #endif } -#endif /* asserts or tests enabled */ /** * Creates a full-duplex pipe (as in socketpair()). diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index b7040abf..d1a48617 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -53,7 +53,7 @@ _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache); * @addtogroup DBusInternalsUtils * @{ */ -#ifndef DBUS_DISABLE_ASSERT + /** * Aborts the program with SIGABRT (dumping core). */ @@ -75,7 +75,6 @@ _dbus_abort (void) abort (); _dbus_exit (1); /* in case someone manages to ignore SIGABRT ? */ } -#endif /** * Wrapper for setenv(). If the value is #NULL, unsets diff --git a/tools/Makefile.am b/tools/Makefile.am index e53b47a9..613b7158 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -16,7 +16,8 @@ dbus_monitor_SOURCES= \ dbus_launch_SOURCES= \ dbus-launch.c \ - dbus-launch-x11.c + dbus-launch-x11.c \ + dbus-launch.h dbus_cleanup_sockets_SOURCES= \ dbus-cleanup-sockets.c |