diff options
| author | raster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> | 2010-09-19 03:04:17 +0000 |
|---|---|---|
| committer | raster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> | 2010-09-19 03:04:17 +0000 |
| commit | 8237f31095cdeb2a50d0b89859dad6b644287f1c (patch) | |
| tree | 3885a62e3f797912d2552a1d8f4d4e035bf7dd3e /src/lib | |
| parent | 81b1e28b17ebb94b49aa86043ab343163667f1b3 (diff) | |
| download | edje-8237f31095cdeb2a50d0b89859dad6b644287f1c.tar.gz edje-8237f31095cdeb2a50d0b89859dad6b644287f1c.tar.bz2 edje-8237f31095cdeb2a50d0b89859dad6b644287f1c.zip | |
warnings--
warnings = 0
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@52452 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/edje_lua2.c | 4 | ||||
| -rw-r--r-- | src/lib/edje_module.c | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/lib/edje_lua2.c b/src/lib/edje_lua2.c index 9b2d65b..406c260 100644 --- a/src/lib/edje_lua2.c +++ b/src/lib/edje_lua2.c @@ -553,6 +553,7 @@ _elua_table_ptr_get(lua_State *L, const void *key) return ptr; } +/* XXX: not used static void _elua_table_ptr_del(lua_State *L, const void *key) { @@ -560,6 +561,7 @@ _elua_table_ptr_del(lua_State *L, const void *key) lua_pushnil(L); lua_settable(L, LUA_REGISTRYINDEX); } +*/ static void _elua_gc(lua_State *L) @@ -1388,6 +1390,7 @@ _elua_2_int_get(lua_State *L, int i, Eina_Bool tr, return n; } +/* XXX: not used static int _elua_3_int_get(lua_State *L, int i, Eina_Bool tr, const char *n1, int *v1, @@ -1436,6 +1439,7 @@ _elua_3_int_get(lua_State *L, int i, Eina_Bool tr, } return n; } +*/ static int _elua_4_int_get(lua_State *L, int i, Eina_Bool tr, diff --git a/src/lib/edje_module.c b/src/lib/edje_module.c index 6b197d1..915d6a0 100644 --- a/src/lib/edje_module.c +++ b/src/lib/edje_module.c @@ -41,6 +41,7 @@ Eina_List *_modules_found = NULL; #if defined(__CEGCC__) || defined(__MINGW32CE__) # define EDJE_MODULE_NAME "edje_%s.dll" +# define EDJE_EXTRA_MODULE_NAME 1 #elif _WIN32 # define EDJE_MODULE_NAME "module.dll" #else @@ -63,8 +64,11 @@ edje_module_load(const char *module) Eina_Module *em; char tmp[PATH_MAX]; - /* A warning is expected has the naming change under wince. */ - snprintf(tmp, sizeof (tmp), "%s/%s/%s/" EDJE_MODULE_NAME, path, module, MODULE_ARCH, module); + snprintf(tmp, sizeof (tmp), "%s/%s/%s/" EDJE_MODULE_NAME, path, module, MODULE_ARCH +#ifdef EDJE_EXTRA_MODULE_NAME + , module +#endif + ); em = eina_module_new(tmp); if (!em) continue ; @@ -158,8 +162,11 @@ edje_available_modules_get(void) { char tmp[PATH_MAX]; - /* A warning is expected has the naming change under wince. */ - snprintf(tmp, sizeof (tmp), "%s/%s/" EDJE_MODULE_NAME, info->path, MODULE_ARCH, ecore_file_file_get(info->path)); + snprintf(tmp, sizeof (tmp), "%s/%s/" EDJE_MODULE_NAME, info->path, MODULE_ARCH +#ifdef EDJE_EXTRA_MODULE_NAME + , ecore_file_file_get(info->path) +#endif + ); if (ecore_file_exists(tmp)) result = eina_list_append(result, eina_stringshare_add(ecore_file_file_get(info->path))); |