From: Enlightenment S. <no-...@en...> - 2011-01-06 18:42:05
|
Log: 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 Author: discomfitor Date: 2011-01-06 10:41:58 -0800 (Thu, 06 Jan 2011) New Revision: 55944 Trac: http://trac.enlightenment.org/e/changeset/55944 Modified: trunk/e/src/bin/e.h trunk/e/src/modules/battery/e_mod_main.h trunk/e/src/modules/illume/e_kbd.c trunk/e/src/modules/illume2/e_mod_kbd_device.c trunk/e/src/modules/temperature/e_mod_main.h Modified: trunk/e/src/bin/e.h =================================================================== --- trunk/e/src/bin/e.h 2011-01-06 18:39:55 UTC (rev 55943) +++ trunk/e/src/bin/e.h 2011-01-06 18:41:58 UTC (rev 55944) @@ -93,10 +93,6 @@ #include <Efreet.h> #include <Efreet_Mime.h> #include <E_DBus.h> -#include <E_Hal.h> -#ifdef HAVE_EEZE -#include <Eeze.h> -#endif #ifdef EAPI #undef EAPI Modified: trunk/e/src/modules/battery/e_mod_main.h =================================================================== --- trunk/e/src/modules/battery/e_mod_main.h 2011-01-06 18:39:55 UTC (rev 55943) +++ trunk/e/src/modules/battery/e_mod_main.h 2011-01-06 18:41:58 UTC (rev 55944) @@ -1,6 +1,12 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#ifdef HAVE_EEZE +# include <Eeze.h> +#else +# include <E_Hal.h> +#endif + typedef struct _Config Config; #define CHECK_NONE 0 Modified: trunk/e/src/modules/illume/e_kbd.c =================================================================== --- trunk/e/src/modules/illume/e_kbd.c 2011-01-06 18:39:55 UTC (rev 55943) +++ trunk/e/src/modules/illume/e_kbd.c 2011-01-06 18:41:58 UTC (rev 55944) @@ -2,6 +2,7 @@ #include "e_kbd.h" #include "e_mod_layout.h" #include "e_cfg.h" +#include <E_Hal.h> static void _e_kbd_layout_send(E_Kbd *kbd); Modified: trunk/e/src/modules/illume2/e_mod_kbd_device.c =================================================================== --- trunk/e/src/modules/illume2/e_mod_kbd_device.c 2011-01-06 18:39:55 UTC (rev 55943) +++ trunk/e/src/modules/illume2/e_mod_kbd_device.c 2011-01-06 18:41:58 UTC (rev 55944) @@ -8,8 +8,10 @@ static void _e_mod_kbd_device_kbd_del(const char *udi); static void _e_mod_kbd_device_kbd_eval(void); #ifdef HAVE_EEZE +# include <Eeze.h> 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 <E_Hal.h> 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); Modified: trunk/e/src/modules/temperature/e_mod_main.h =================================================================== --- trunk/e/src/modules/temperature/e_mod_main.h 2011-01-06 18:39:55 UTC (rev 55943) +++ trunk/e/src/modules/temperature/e_mod_main.h 2011-01-06 18:41:58 UTC (rev 55944) @@ -1,6 +1,12 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#ifdef HAVE_EEZE +# include <Eeze.h> +#else +# include <E_Hal.h> +#endif + #include "e_mod_main_private.h" typedef struct _Config Config; |