From 184812f289126dea36f7c7c2641c8992a3fb4025 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 26 Jan 2008 05:40:53 +0000 Subject: [PATCH] replace a lot of win32 ifdef hacks with autoconf checks SVN revision: 33616 --- legacy/ecore/configure.in | 3 +- legacy/ecore/src/lib/ecore/Ecore.h | 3 -- legacy/ecore/src/lib/ecore/ecore.c | 13 ++++--- legacy/ecore/src/lib/ecore/ecore_main.c | 6 ++-- legacy/ecore/src/lib/ecore/ecore_path.c | 15 +++----- legacy/ecore/src/lib/ecore/ecore_plugin.c | 34 ++++++++----------- legacy/ecore/src/lib/ecore/ecore_private.h | 10 +++--- legacy/ecore/src/lib/ecore/ecore_time.c | 6 ++-- legacy/ecore/src/lib/ecore_con/ecore_con.c | 9 ++--- .../src/lib/ecore_evas/ecore_evas_private.h | 6 +++- legacy/ecore/src/lib/ecore_file/ecore_file.c | 4 ++- legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c | 9 ++--- 12 files changed, 62 insertions(+), 56 deletions(-) diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index a4ff91a7fa..c983ea4b0e 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -25,6 +25,7 @@ AC_HEADER_SYS_WAIT AC_LIBTOOL_WIN32_DLL define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl AC_PROG_LIBTOOL +AC_DEFINE_UNQUOTED(SHARED_LIB_SUFFIX, "$shrext_cmds", [Suffix for shared objects]) VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'` VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'` @@ -56,7 +57,7 @@ PKG_PROG_PKG_CONFIG dnl check common functions and headers AC_CHECK_FUNCS(gettimeofday) AC_CHECK_FUNCS(strlcpy) -AC_CHECK_HEADERS(netinet/in.h) +AC_CHECK_HEADERS_ONCE(dlfcn.h features.h langinfo.h locale.h netinet/in.h sys/mman.h sys/time.h windows.h winsock2.h) AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) AC_SUBST(dlopen_libs) diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h index 711a588983..7dd2a2d204 100644 --- a/legacy/ecore/src/lib/ecore/Ecore.h +++ b/legacy/ecore/src/lib/ecore/Ecore.h @@ -129,9 +129,6 @@ extern "C" { typedef struct _Ecore_Exe_Event_Data_Line Ecore_Exe_Event_Data_Line; /**< Lines from a child process */ typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data; /**< Data from a child process */ -#ifndef _WIN32 -#endif - struct _Ecore_Event_Signal_User /** User signal event */ { int number; /**< The signal number. Either 1 or 2 */ diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c index 41b2556f27..d549e35658 100644 --- a/legacy/ecore/src/lib/ecore/ecore.c +++ b/legacy/ecore/src/lib/ecore/ecore.c @@ -1,11 +1,16 @@ -#include -#ifndef _WIN32 +#include +#ifdef HAVE_LOCALE_H +# include +#endif +#ifdef HAVE_LANGINFO_H # include -#else +#endif +#ifdef HAVE_WINDOWS_H # define WIN32_LEAN_AND_MEAN # include # undef WIN32_LEAN_AND_MEAN -#endif /* _WIN32 */ +#endif + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c index 258bd5e26e..8ed0e93409 100644 --- a/legacy/ecore/src/lib/ecore/ecore_main.c +++ b/legacy/ecore/src/lib/ecore/ecore_main.c @@ -2,9 +2,11 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#ifdef _WIN32 +#include + +#ifdef HAVE_WINSOCK2_H # include -#endif /* _WIN32 */ +#endif #include #include diff --git a/legacy/ecore/src/lib/ecore/ecore_path.c b/legacy/ecore/src/lib/ecore/ecore_path.c index ac4849ec40..bb2048ef2c 100644 --- a/legacy/ecore/src/lib/ecore/ecore_path.c +++ b/legacy/ecore/src/lib/ecore/ecore_path.c @@ -1,6 +1,9 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + +#include + #include "ecore_private.h" #include "Ecore_Data.h" #include "Ecore_Str.h" @@ -183,11 +186,7 @@ ecore_path_group_available(Ecore_Path_Group *group) ext = strrchr(d->d_name, '.'); -#ifndef _WIN32 - if (!ext || strncmp(ext, ".so", 3)) -#else - if (!ext || strncmp(ext, ".dll", 4)) -#endif /* _WIN32 */ + if (!ext || strncmp(ext, SHARED_LIB_SUFFIX, sizeof(SHARED_LIB_SUFFIX))) continue; snprintf(ppath, PATH_MAX, "%s/%s", path, d->d_name); @@ -259,11 +258,7 @@ ecore_plugin_available_get(Ecore_Path_Group *group) if (*d->d_name == '.') continue; -#ifndef _WIN32 - if (!ecore_str_has_suffix(d->d_name, ".so")) -#else - if (!ecore_str_has_suffix(d->d_name, ".dll")) -#endif /* _WIN32 */ + if (!ecore_str_has_suffix(d->d_name, SHARED_LIB_SUFFIX)) continue; snprintf(ppath, PATH_MAX, "%s/%s", path, d->d_name); diff --git a/legacy/ecore/src/lib/ecore/ecore_plugin.c b/legacy/ecore/src/lib/ecore/ecore_plugin.c index 91fb43c3a0..de8def58c2 100644 --- a/legacy/ecore/src/lib/ecore/ecore_plugin.c +++ b/legacy/ecore/src/lib/ecore/ecore_plugin.c @@ -2,21 +2,26 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#ifndef _WIN32 +#include + +#ifdef HAVE_DLFCN_H # include -#else +#endif + +#ifdef HAVE_WINDOWS_H # define WIN32_LEAN_AND_MEAN # include # undef WIN32_LEAN_AND_MEAN -# include -# include -#endif /* _WIN32 */ +#endif + +#include +#include #include "ecore_private.h" #include "Ecore_Data.h" /* FIXME: that hack is a temporary one. That code will be in MinGW soon */ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(HAVE_DLFCN_H) # define RTLD_LAZY 1 /* lazy function call binding */ # define RTLD_NOW 2 /* immediate function call binding */ @@ -86,7 +91,7 @@ char *dlerror (void) return NULL; } -#endif /* _WIN32 */ +#endif static Ecore_List *loaded_plugins = NULL; @@ -118,28 +123,19 @@ ecore_plugin_load(Ecore_Path_Group *group, const char *plugin_name, const char * CHECK_PARAM_POINTER_RETURN("plugin_name", plugin_name, NULL); -#ifndef _WIN32 if (!version || *version == '\0') - snprintf(temp, sizeof(temp), "%s.so", plugin_name); + snprintf(temp, sizeof(temp), "%s" SHARED_LIB_SUFFIX, plugin_name); else - snprintf(temp, sizeof(temp), "%s.so.%s", plugin_name, version); -#else - if (!version || *version == '\0') - snprintf(temp, sizeof(temp), "%s.dll", plugin_name); - else - snprintf(temp, sizeof(temp), "%s-%s.dll", plugin_name, version); -#endif /* _WIN32 */ + snprintf(temp, sizeof(temp), "%s" SHARED_LIB_SUFFIX ".%s", plugin_name, version); path = ecore_path_group_find(group, temp); -#ifndef _WIN32 if (!path && version) { /* if this file doesn't exist try a different order */ - snprintf(temp, sizeof(temp), "%s.%s.so", plugin_name, version); + snprintf(temp, sizeof(temp), "%s.%s" SHARED_LIB_SUFFIX, plugin_name, version); path = ecore_path_group_find(group, temp); } -#endif /* _WIN32 */ if (!path) return NULL; diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h index b6c039d582..91f3a81db4 100644 --- a/legacy/ecore/src/lib/ecore/ecore_private.h +++ b/legacy/ecore/src/lib/ecore/ecore_private.h @@ -1,6 +1,10 @@ #ifndef _ECORE_PRIVATE_H #define _ECORE_PRIVATE_H +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include @@ -13,14 +17,10 @@ #include #include -#ifndef _WIN32 +#ifdef HAVE_SYS_MMAN_H # include #endif -#ifdef HAVE_CONFIG_H -# include -#endif - #ifdef EAPI # undef EAPI #endif diff --git a/legacy/ecore/src/lib/ecore/ecore_time.c b/legacy/ecore/src/lib/ecore/ecore_time.c index 865c6419f9..73f4ba9e46 100644 --- a/legacy/ecore/src/lib/ecore/ecore_time.c +++ b/legacy/ecore/src/lib/ecore/ecore_time.c @@ -2,11 +2,13 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#ifdef _WIN32 +#include +#ifdef HAVE_WINDOWS_H # define WIN32_LEAN_AND_MEAN # include # undef WIN32_LEAN_AND_MEAN -#else +#endif +#ifdef HAVE_SYS_TIME_H # include #endif #include "ecore_private.h" diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index 42dab537b1..6699fe69c9 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -9,7 +9,7 @@ #include #include -#include "config.h" +#include #if USE_OPENSSL #include @@ -21,9 +21,10 @@ #include "ecore_con_private.h" #ifdef HAVE_NETINET_IN_H -#include -#elif _WIN32 -#include +# include +#endif +#ifdef HAVE_WINSOCK2_H +# include #endif static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he); diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h index 91c66238f1..72ca49598a 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h @@ -4,13 +4,17 @@ #ifndef _ECORE_EVAS_PRIVATE_H #define _ECORE_EVAS_PRIVATE_H +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore_Data.h" #include #include #include -#ifndef _WIN32 +#ifdef HAVE_SYS_MMAN_H # include #endif diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/legacy/ecore/src/lib/ecore_file/ecore_file.c index 31834562ab..8c2c8c646a 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file.c @@ -2,11 +2,13 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#include + #ifndef _FILE_OFFSET_BITS # define _FILE_OFFSET_BITS 64 #endif -#ifdef __linux__ +#ifdef HAVE_FEATURES_H # include #endif #include diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c index 293041f4f5..1ea788787a 100644 --- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c +++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c @@ -1,14 +1,15 @@ #include "Ecore.h" -#include "config.h" +#include #include "Ecore_Con.h" #include "ecore_private.h" #include "ecore_ipc_private.h" #include "Ecore_Ipc.h" #ifdef HAVE_NETINET_IN_H -#include -#elif _WIN32 -#include +# include +#endif +#ifdef HAVE_WINSOCK2_H +# include #endif #define DLT_ZERO 0