dont assert when there is no valid key layout present

[chaz/openbox] / obt / mainloop.c

diff --git a/obt/mainloop.c b/obt/mainloop.c
index 64972dd708eb17aecec0fae7fa9190d6c1be12aa..bf866aec5e250deda309cecd2bd8b371a763e583 100644 (file)
--- a/obt/mainloop.c
+++ b/obt/mainloop.c
@@ -21,10 +21,21 @@
 #include "obt/display.h"
 #include "obt/util.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 
 typedef struct _ObtMainLoopTimer             ObtMainLoopTimer;
 typedef struct _ObtMainLoopSignal            ObtMainLoopSignal;
@@ -140,7 +151,7 @@ struct _ObtMainLoopFdHandlerType
     GDestroyNotify destroy;
 };
 
-ObtMainLoop *obt_main_loop_new()
+ObtMainLoop *obt_main_loop_new(void)
 {
     ObtMainLoop *loop;