changeset 4692:84f70d4b36e6

Fix compile when signalfd is not available entirely.
author William Pitcock <nenolod@atheme.org>
date Sat, 05 Jul 2008 17:04:39 -0500
parents 5db8a7848565
children 463675303b6f
files configure.ac src/audacious/signals.c
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sat Jul 05 16:56:35 2008 -0500
+++ b/configure.ac	Sat Jul 05 17:04:39 2008 -0500
@@ -66,7 +66,7 @@
 
 dnl Check for headers and functions
 dnl ===============================
-AC_CHECK_HEADERS([unistd.h fcntl.h sys/ioctl.h fnmatch.h limits.h wchar.h fts.h execinfo.h])
+AC_CHECK_HEADERS([unistd.h fcntl.h sys/ioctl.h fnmatch.h limits.h wchar.h fts.h execinfo.h sys/signalfd.h])
 AC_CHECK_FUNCS([mkdtemp getmntinfo statvfs strtoul lrintf signalfd])
 
 
--- a/src/audacious/signals.c	Sat Jul 05 16:56:35 2008 -0500
+++ b/src/audacious/signals.c	Sat Jul 05 17:04:39 2008 -0500
@@ -85,7 +85,7 @@
     abort();
 }
 
-#ifndef HAVE_SIGNALFD
+#if !defined(HAVE_SIGNALFD) && !defined(HAVE_SYS_SIGNALFD_H)
 
 static void *
 signal_process_signals (void *data)
@@ -341,6 +341,8 @@
     }
 #endif
 
+#if !defined(HAVE_SIGNALFD) && !defined(HAVE_SYS_SIGNALFD_H)
+
     if (signal_check_for_broken_impl() != TRUE)
     {
         signal_initialize_blockers();
@@ -361,4 +363,11 @@
         g_thread_create(signal_process_signals_linuxthread, NULL, FALSE, NULL);
 
     }
+
+#else
+
+    signal_initialize_blockers();
+    g_thread_create(signal_process_signals, NULL, FALSE, NULL);
+
+#endif
 }