discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bb8833a52698e485d4ef7fb935e765f094ce9727
commit bb8833a52698e485d4ef7fb935e765f094ce9727 Author: Mike Blumenkrantz <[email protected]> Date: Mon Jan 27 08:34:46 2014 -0500 set pager* config functions as EINTERN these functions have the same name, so (un)loading them will result in symbol conflicts unless they are not exported --- src/modules/pager/e_mod_config.c | 2 +- src/modules/pager/e_mod_main.c | 2 +- src/modules/pager/e_mod_main.h | 4 ++-- src/modules/pager16/e_mod_config.c | 2 +- src/modules/pager16/e_mod_main.c | 2 +- src/modules/pager16/e_mod_main.h | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index 895c02a..389f41f 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -50,7 +50,7 @@ static Eina_Bool _grab_cb_mouse_down(void *data, int type, void *event); static Eina_Bool _grab_cb_key_down(void *data, int type, void *event); static void _cb_disable_check_list(void *data, Evas_Object *obj); -void +EINTERN void _config_pager_module(Config_Item *ci) { E_Config_Dialog *cfd; diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 6119f8d..03ebcc9 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -916,7 +916,7 @@ _pager_instance_drop_zone_recalc(Instance *inst) e_drop_handler_geometry_set(inst->pager->drop_handler, x, y, w, h); } -void +EINTERN void _pager_cb_config_updated(void) { Pager *p; diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h index 23123e1..ce631a0 100644 --- a/src/modules/pager/e_mod_main.h +++ b/src/modules/pager/e_mod_main.h @@ -45,8 +45,8 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -void _pager_cb_config_updated(void); -void _config_pager_module(Config_Item *ci); +EINTERN void _pager_cb_config_updated(void); +EINTERN void _config_pager_module(Config_Item *ci); extern Config *pager_config; /** diff --git a/src/modules/pager16/e_mod_config.c b/src/modules/pager16/e_mod_config.c index f140acb..becfc17 100644 --- a/src/modules/pager16/e_mod_config.c +++ b/src/modules/pager16/e_mod_config.c @@ -50,7 +50,7 @@ static Eina_Bool _grab_cb_mouse_down(void *data, int type, void *event); static Eina_Bool _grab_cb_key_down(void *data, int type, void *event); static void _cb_disable_check_list(void *data, Evas_Object *obj); -void +EINTERN void _config_pager_module(Config_Item *ci) { E_Config_Dialog *cfd; diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c index 9500456..e36ace1 100644 --- a/src/modules/pager16/e_mod_main.c +++ b/src/modules/pager16/e_mod_main.c @@ -863,7 +863,7 @@ _pager_instance_drop_zone_recalc(Instance *inst) e_drop_handler_geometry_set(inst->pager->drop_handler, x, y, w, h); } -void +EINTERN void _pager_cb_config_updated(void) { Pager *p; diff --git a/src/modules/pager16/e_mod_main.h b/src/modules/pager16/e_mod_main.h index 60a10f7..b324b9d 100644 --- a/src/modules/pager16/e_mod_main.h +++ b/src/modules/pager16/e_mod_main.h @@ -44,8 +44,8 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -void _pager_cb_config_updated(void); -void _config_pager_module(Config_Item *ci); +EINTERN void _pager_cb_config_updated(void); +EINTERN void _config_pager_module(Config_Item *ci); extern Config *pager_config; /** --
