Commit ff99239b authored by John Palmieri's avatar John Palmieri

* 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
parent 25452492
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
......
......@@ -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)
......
......@@ -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()).
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment