From 67b1000afa1b3b66c03b880997f8f2f2c239b312 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 6 Jan 2011 18:41:58 +0000 Subject: [PATCH] fix compile when ehal is not present note that illume1 still requires ehal and I have no plans to write an eeze backend for it SVN revision: 55944 --- src/bin/e.h | 4 ---- src/modules/battery/e_mod_main.h | 6 ++++++ src/modules/illume/e_kbd.c | 1 + src/modules/illume2/e_mod_kbd_device.c | 2 ++ src/modules/temperature/e_mod_main.h | 6 ++++++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/bin/e.h b/src/bin/e.h index c1c0eb3cc..2b1c5f286 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -93,10 +93,6 @@ void *alloca (size_t); #include #include #include -#include -#ifdef HAVE_EEZE -#include -#endif #ifdef EAPI #undef EAPI diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h index a934ac613..62e44e59b 100644 --- a/src/modules/battery/e_mod_main.h +++ b/src/modules/battery/e_mod_main.h @@ -1,6 +1,12 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#ifdef HAVE_EEZE +# include +#else +# include +#endif + typedef struct _Config Config; #define CHECK_NONE 0 diff --git a/src/modules/illume/e_kbd.c b/src/modules/illume/e_kbd.c index 7a9e125fd..e69931649 100644 --- a/src/modules/illume/e_kbd.c +++ b/src/modules/illume/e_kbd.c @@ -2,6 +2,7 @@ #include "e_kbd.h" #include "e_mod_layout.h" #include "e_cfg.h" +#include static void _e_kbd_layout_send(E_Kbd *kbd); diff --git a/src/modules/illume2/e_mod_kbd_device.c b/src/modules/illume2/e_mod_kbd_device.c index 7cd004696..6094ee42f 100644 --- a/src/modules/illume2/e_mod_kbd_device.c +++ b/src/modules/illume2/e_mod_kbd_device.c @@ -8,8 +8,10 @@ static void _e_mod_kbd_device_kbd_add(const char *udi); static void _e_mod_kbd_device_kbd_del(const char *udi); static void _e_mod_kbd_device_kbd_eval(void); #ifdef HAVE_EEZE +# include static void _e_mod_kbd_device_udev_event(const char *device, Eeze_Udev_Event event, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__); #else +# include static void _e_mod_kbd_device_cb_input_kbd(void *data __UNUSED__, void *reply, DBusError *err); static void _e_mod_kbd_device_cb_input_kbd_is(void *data, void *reply, DBusError *err); static void _e_mod_kbd_device_dbus_add(void *data __UNUSED__, DBusMessage *msg); diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h index aefee401b..c91f1b6c3 100644 --- a/src/modules/temperature/e_mod_main.h +++ b/src/modules/temperature/e_mod_main.h @@ -1,6 +1,12 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#ifdef HAVE_EEZE +# include +#else +# include +#endif + #include "e_mod_main_private.h" typedef struct _Config Config;