From bca91fb4c2d3381352ce0f018cf95cbff7892b26 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 19 Dec 2009 12:05:20 +0000 Subject: [PATCH] more portable way to get the sufix of a shared library name SVN revision: 44573 --- legacy/edje/configure.ac | 2 ++ legacy/edje/src/lib/edje_module.c | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac index f8ba8c7..13f21a0 100644 --- a/legacy/edje/configure.ac +++ b/legacy/edje/configure.ac @@ -35,6 +35,8 @@ case "$host_os" in esac AC_SUBST(release_info) +AC_DEFINE_UNQUOTED(SHARED_LIB_SUFFIX, "$shrext_cmds", [Suffix for shared objects]) + ### Default options with respect to host diff --git a/legacy/edje/src/lib/edje_module.c b/legacy/edje/src/lib/edje_module.c index 1a77919..dd4cea7 100644 --- a/legacy/edje/src/lib/edje_module.c +++ b/legacy/edje/src/lib/edje_module.c @@ -33,12 +33,6 @@ void *alloca (size_t); #include "Edje.h" -#if defined(_WIN32) || defined(__CYGWIN__) -# define MODULE_EXTENSION ".dll" -#else -# define MODULE_EXTENSION ".so" -#endif /* !defined(_WIN32) && !defined(__CYGWIN__) */ - #define LOG_COLOR "\033[36m" Eina_Hash *_registered_modules = NULL; @@ -54,7 +48,7 @@ _edje_module_name_get(Eina_Module *m) name = ecore_file_file_get(eina_module_file_get(m)); len = strlen(name); - len -= sizeof(MODULE_EXTENSION) - 1; + len -= sizeof(SHARED_LIB_SUFFIX) - 1; if (len <= 0) return NULL; return eina_stringshare_add_length(name, len); } -- 2.7.4