discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=33631fa62271b2ece2cb57a57e5718a1627c34c9
commit 33631fa62271b2ece2cb57a57e5718a1627c34c9 Author: Jean Guyomarc'h <jean.guyoma...@gmail.com> Date: Mon Apr 13 15:26:54 2015 -0400 modules/bluez4: fix duplicated symbol Summary: Global variable should be declared as extern to avoid symbol duplication. Fix compiling of ebluez4 module on OS X. Test Plan: Since Enlightenment cannot (yet) be fully compiled on OS X, I cannot test the real-life impact of this change. Reviewers: zmike, raster Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2327 --- src/modules/bluez4/ebluez4.c | 2 ++ src/modules/bluez4/ebluez4.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/bluez4/ebluez4.c b/src/modules/bluez4/ebluez4.c index f2ce8bf..b7891d3 100644 --- a/src/modules/bluez4/ebluez4.c +++ b/src/modules/bluez4/ebluez4.c @@ -4,6 +4,8 @@ #include "e_mod_main.h" #include "ebluez4.h" +Context *ctxt = NULL; + typedef struct _Pair_Cb { void (*cb)(void *, Eina_Bool, const char *); diff --git a/src/modules/bluez4/ebluez4.h b/src/modules/bluez4/ebluez4.h index 058defe..9d61475 100644 --- a/src/modules/bluez4/ebluez4.h +++ b/src/modules/bluez4/ebluez4.h @@ -70,7 +70,7 @@ typedef struct _Context Eina_List *adapters; } Context; -Context *ctxt; +extern Context *ctxt; void ebluez4_eldbus_init(void); void ebluez4_eldbus_shutdown(void); --