Commit 01d9d169 authored by Marcus Brinkmann's avatar Marcus Brinkmann Committed by Ralf Habacker

Make more signal and locale interface use conditional.

parent e1833993
......@@ -29,7 +29,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
......@@ -67,9 +69,11 @@ signal_handler (int sig)
}
break;
#endif
#ifdef SIGTERM
case SIGTERM:
_dbus_loop_quit (bus_context_get_loop (context));
break;
#endif
}
}
......@@ -474,7 +478,9 @@ main (int argc, char **argv)
#ifdef SIGHUP
_dbus_set_signal_handler (SIGHUP, signal_handler);
#endif
#ifdef SIGTERM
_dbus_set_signal_handler (SIGTERM, signal_handler);
#endif
#ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
_dbus_set_signal_handler (SIGIO, signal_handler);
#endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
......
......@@ -477,6 +477,10 @@ AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
AC_CHECK_HEADERS(errno.h)
AC_CHECK_HEADERS(signal.h)
AC_CHECK_HEADERS(locale.h)
AC_CHECK_HEADERS(byteswap.h)
AC_CHECK_HEADERS(unistd.h)
......
......@@ -35,7 +35,9 @@
*
* These are the standard ANSI C headers...
*/
#if HAVE_LOCALE_H
#include <locale.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
......@@ -623,10 +625,14 @@ ascii_strtod (const char *nptr,
fail_pos = NULL;
#if HAVE_LOCALE_H
locale_data = localeconv ();
decimal_point = locale_data->decimal_point;
decimal_point_len = strlen (decimal_point);
#else
decimal_point = ".";
#endif
decimal_point_len = strlen (decimal_point);
_dbus_assert (decimal_point_len != 0);
decimal_point_pos = NULL;
......
......@@ -27,7 +27,9 @@
#include "dbus-test.h"
#include <stdio.h>
#include <stdlib.h>
#if HAVE_LOCALE_H
#include <locale.h>
#endif
int
main (int argc,
......@@ -36,8 +38,9 @@ main (int argc,
const char *test_data_dir;
const char *specific_test;
#if HAVE_LOCALE_H
setlocale(LC_ALL, "");
#endif
if (argc > 1)
test_data_dir = argv[1];
......
/* This is simply a process that segfaults */
#include <config.h>
#include <stdlib.h>
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifdef HAVE_SETRLIMIT
#include <sys/resource.h>
......
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