aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhandyande <handyande>2009-01-13 16:30:37 +0000
committerhandyande <handyande@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2009-01-13 16:30:37 +0000
commit61801ee22d8519d758109774b1971b8903d21e39 (patch)
treef4ec2aa106b5e341bab9b892cb30f73a38ee2841
parent148b199424557ef776036e4cf92b11179c43c2ed (diff)
downloadenlightenment-61801ee22d8519d758109774b1971b8903d21e39.tar.gz
enlightenment-61801ee22d8519d758109774b1971b8903d21e39.tar.xz
enlightenment-61801ee22d8519d758109774b1971b8903d21e39.zip
Fixup compile / link errors with OSX, still having a small issue with the batter module linking, but getting there
SVN revision: 38570
-rw-r--r--src/bin/e_configure.c2
-rw-r--r--src/bin/e_configure.h2
-rw-r--r--src/modules/battery/batget.c2
-rw-r--r--src/modules/gadman/e_mod_gadman.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 1179b23af..cbdbd5362 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -5,7 +5,7 @@ static int _e_configure_cb_efreet_desktop_list_change(void *data, int type, void
static int _e_configure_cb_efreet_desktop_change(void *data, int type, void *event);
static void _e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params), Efreet_Desktop *desktop);
-Eina_List *e_configure_registry = NULL;
+EAPI Eina_List *e_configure_registry = NULL;
static Eina_List *handlers = NULL;
diff --git a/src/bin/e_configure.h b/src/bin/e_configure.h
index d85685ad5..13beebc19 100644
--- a/src/bin/e_configure.h
+++ b/src/bin/e_configure.h
@@ -39,7 +39,7 @@ EAPI int e_configure_registry_exists(const char *path);
EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, E_Container *con, const char *params, Efreet_Desktop *desktop), const void *data);
EAPI void e_configure_init(void);
-EAPI Eina_List *e_configure_registry;
+extern EAPI Eina_List *e_configure_registry;
#endif
#endif
diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
index cc9da8225..eda696a75 100644
--- a/src/modules/battery/batget.c
+++ b/src/modules/battery/batget.c
@@ -1480,7 +1480,7 @@ poll_cb(void *data)
}
#elif defined(HAVE_CFBASE_H) /* OS X */
darwin_check();
- break;
+ return 1;
#else
switch (mode)
{
diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h
index 36da5e126..603af9b28 100644
--- a/src/modules/gadman/e_mod_gadman.h
+++ b/src/modules/gadman/e_mod_gadman.h
@@ -57,7 +57,7 @@ struct _Manager
Config *conf;
};
-Manager *Man;
+extern Manager *Man;
void gadman_init(E_Module *m);
void gadman_shutdown(void);