From a943f063bc3903f26c19537b61d3e84111239db9 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 23 Nov 2012 21:55:46 +0000 Subject: [PATCH] ecore, eio : revert alloca commits (and other solaris math commits, i know) SVN revision: 79610 --- legacy/ecore/ChangeLog | 5 --- legacy/ecore/src/lib/ecore/ecore_alloc.c | 18 ---------- legacy/ecore/src/lib/ecore/ecore_exe.c | 18 ---------- legacy/ecore/src/lib/ecore/ecore_getopt.c | 35 +++++++++---------- legacy/ecore/src/lib/ecore/ecore_pipe.c | 4 --- legacy/ecore/src/lib/ecore_con/dns.c | 20 +---------- legacy/ecore/src/lib/ecore_con/ecore_con.c | 18 ---------- .../ecore/src/lib/ecore_con/ecore_con_alloc.c | 18 ---------- .../ecore/src/lib/ecore_con/ecore_con_eet.c | 18 ---------- .../ecore/src/lib/ecore_con/ecore_con_info.c | 1 - .../src/lib/ecore_con/ecore_con_local_win32.c | 18 ---------- .../ecore/src/lib/ecore_con/ecore_con_socks.c | 18 ---------- .../ecore/src/lib/ecore_con/ecore_con_ssl.c | 18 ---------- .../ecore/src/lib/ecore_config/ecore_config.c | 18 ---------- .../src/lib/ecore_evas/ecore_evas_extn.c | 18 ---------- .../lib/ecore_evas/ecore_evas_wayland_egl.c | 18 ---------- .../lib/ecore_evas/ecore_evas_wayland_shm.c | 18 ---------- legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c | 18 ---------- legacy/ecore/src/lib/ecore_file/ecore_file.c | 18 ---------- .../src/lib/ecore_file/ecore_file_monitor.c | 18 ---------- .../src/lib/ecore_imf/ecore_imf_context.c | 18 ---------- legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c | 18 ---------- legacy/ecore/src/lib/ecore_wayland/ecore_wl.c | 18 ---------- .../src/lib/ecore_wayland/ecore_wl_output.c | 18 ---------- .../src/lib/ecore_wayland/ecore_wl_window.c | 18 ---------- .../src/lib/ecore_win32/ecore_win32_window.c | 18 ---------- .../src/lib/ecore_wince/ecore_wince_window.c | 18 ---------- .../ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c | 22 ------------ .../src/lib/ecore_x/xcb/ecore_xcb_image.c | 22 ------------ .../src/lib/ecore_x/xcb/ecore_xcb_selection.c | 22 ------------ .../src/lib/ecore_x/xcb/ecore_xcb_window.c | 22 ------------ legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c | 18 ---------- .../src/lib/ecore_x/xlib/ecore_x_atoms.c | 1 - legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c | 18 ---------- .../src/lib/ecore_x/xlib/ecore_x_image.c | 18 ---------- .../src/lib/ecore_x/xlib/ecore_x_randr_12.c | 18 ---------- .../src/lib/ecore_x/xlib/ecore_x_selection.c | 18 ---------- .../lib/ecore_x/xlib/ecore_x_window_prop.c | 18 ---------- legacy/eio/configure.ac | 1 - legacy/eio/src/lib/eio_dir.c | 4 --- legacy/eio/src/lib/eio_eet.c | 4 --- legacy/eio/src/lib/eio_file.c | 22 ------------ legacy/eio/src/lib/eio_main.c | 5 --- legacy/eio/src/lib/eio_map.c | 4 --- legacy/eio/src/lib/eio_monitor.c | 4 --- legacy/eio/src/lib/eio_monitor_inotify.c | 22 ------------ legacy/eio/src/lib/eio_monitor_poll.c | 22 ------------ legacy/eio/src/lib/eio_monitor_win32.c | 22 ------------ legacy/eio/src/lib/eio_private.h | 4 +++ legacy/eio/src/lib/eio_single.c | 5 --- legacy/eio/src/lib/eio_xattr.c | 4 --- 51 files changed, 22 insertions(+), 759 deletions(-) diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog index 992f479ed6..6cc4a95d39 100644 --- a/legacy/ecore/ChangeLog +++ b/legacy/ecore/ChangeLog @@ -1022,8 +1022,3 @@ 2012-11-23 Eduardo Lima (Etrunko) * Fix leak of strcut wl_registry in Ecore Wayland - -2012-11-23 Sebastian Dransfeld - - * Correctly define alloca - * Minor build fixes for solaris diff --git a/legacy/ecore/src/lib/ecore/ecore_alloc.c b/legacy/ecore/src/lib/ecore/ecore_alloc.c index fc51e50319..bec66ef0d5 100644 --- a/legacy/ecore/src/lib/ecore/ecore_alloc.c +++ b/legacy/ecore/src/lib/ecore/ecore_alloc.c @@ -2,24 +2,6 @@ # include "config.h" #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include diff --git a/legacy/ecore/src/lib/ecore/ecore_exe.c b/legacy/ecore/src/lib/ecore/ecore_exe.c index f3f5220226..7cc4b0f3bb 100644 --- a/legacy/ecore/src/lib/ecore/ecore_exe.c +++ b/legacy/ecore/src/lib/ecore/ecore_exe.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore/ecore_getopt.c b/legacy/ecore/src/lib/ecore/ecore_getopt.c index d3ffb282f3..377d310f53 100644 --- a/legacy/ecore/src/lib/ecore/ecore_getopt.c +++ b/legacy/ecore/src/lib/ecore/ecore_getopt.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #ifdef STDC_HEADERS # include # include @@ -28,6 +10,23 @@ void *alloca (size_t); # include # endif #endif +#ifdef HAVE_ALLOCA_H +# include +#elif !defined alloca +# ifdef __GNUC__ +# define alloca __builtin_alloca +# elif defined _AIX +# define alloca __alloca +# elif defined _MSC_VER +# include +# define alloca _alloca +# elif !defined HAVE_ALLOCA +# ifdef __cplusplus +extern "C" +# endif +void *alloca (size_t); +# endif +#endif #include #include diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/legacy/ecore/src/lib/ecore/ecore_pipe.c index 7e0e866712..5da0923f72 100644 --- a/legacy/ecore/src/lib/ecore/ecore_pipe.c +++ b/legacy/ecore/src/lib/ecore/ecore_pipe.c @@ -7,10 +7,6 @@ #include #include -#ifdef __SUNPRO_C -# include -#endif - #ifdef HAVE_ISFINITE # define ECORE_FINITE(t) isfinite(t) #else diff --git a/legacy/ecore/src/lib/ecore_con/dns.c b/legacy/ecore/src/lib/ecore_con/dns.c index 4582f5bad7..b92a3156f5 100644 --- a/legacy/ecore/src/lib/ecore_con/dns.c +++ b/legacy/ecore/src/lib/ecore_con/dns.c @@ -27,24 +27,6 @@ # include "config.h" #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #if !defined(__FreeBSD__) #ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 600 @@ -696,7 +678,7 @@ size_t dns_strlcat(char *dst, const char *src, size_t lim) { } /* dns_strlcat() */ -#if defined(_WIN32) || defined(__SUNPRO_C) +#if _WIN32 static char *dns_strsep(char **sp, const char *delim) { char *p; diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index 1b253b997b..6298d0483a 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_alloc.c b/legacy/ecore/src/lib/ecore_con/ecore_con_alloc.c index 11ad036ee2..324d47d100 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_alloc.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_alloc.c @@ -2,24 +2,6 @@ # include "config.h" #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "Ecore.h" #include "ecore_private.h" #include "Ecore_Con.h" diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_eet.c b/legacy/ecore/src/lib/ecore_con/ecore_con_eet.c index 6802fe3050..ece348ef8d 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_eet.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_eet.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include "Ecore_Con_Eet.h" diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c b/legacy/ecore/src/lib/ecore_con/ecore_con_info.c index afd90a4842..fdcf0b9a58 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_info.c @@ -9,7 +9,6 @@ # include #endif -#undef alloca #ifdef HAVE_ALLOCA_H # include #elif defined __GNUC__ diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c b/legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c index 67b1717617..2b7e5c5bd2 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_socks.c b/legacy/ecore/src/lib/ecore_con/ecore_con_socks.c index 4e0abd355f..ad9b9ca23e 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_socks.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_socks.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c index 3eb59b342b..1027dbb118 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #if USE_GNUTLS # include # include diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c index d8194fea0b..e81538eb62 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c index 24ecc6416e..c192a3a82b 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c index e2a27816f4..430da4b8cb 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c @@ -2,24 +2,6 @@ # include "config.h" #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - //#define LOGFNS 1 #ifdef LOGFNS diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c index c6e8ec3ffe..f587e3da5c 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c @@ -2,24 +2,6 @@ # include "config.h" #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - //#define LOGFNS 1 #ifdef LOGFNS diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c index 2cfe55b0c1..09e3f37c1b 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "Ecore_Fb.h" #include "ecore_fb_private.h" diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/legacy/ecore/src/lib/ecore_file/ecore_file.c index b276e33580..6876511fc6 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c index ee0d8821ad..8b07589a9e 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_file_private.h" typedef enum { diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c index cd8ef81c34..d9aeca9836 100644 --- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c +++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c index b62295b989..0480001aa5 100644 --- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c +++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #ifdef HAVE_NETINET_IN_H diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c index 44196853fa..8abfc74bfa 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include "ecore_wl_private.h" diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_output.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_output.c index d8db6e4ad8..c30086d053 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_output.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_output.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_wl_private.h" /* local function prototypes */ diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c index 1138b32116..80b443b4ca 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_wl_private.h" /* local function prototypes */ diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c index c6fa105223..36f8a86047 100644 --- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c +++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include /* for printf */ diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c index 4f493da8c3..49a6312da3 100644 --- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c +++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #define WIN32_LEAN_AND_MEAN #include #undef WIN32_LEAN_AND_MEAN diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c index b13e566abb..82d94b634f 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c @@ -1,25 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_xcb_private.h" /* local function prototypes */ diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c index 92c8c9c2f2..8e221101b0 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c @@ -1,25 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_xcb_private.h" #include #include diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c index be4a37e1cc..288d776b2f 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c @@ -1,25 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_xcb_private.h" //#include "Ecore_X_Atoms.h" diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c index 2b17c61f24..ba18b503b9 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c @@ -1,25 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_xcb_private.h" #ifdef ECORE_XCB_RENDER # include diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c index 1d92f7d97e..7cb777d0cd 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c @@ -2,24 +2,6 @@ # include #endif /* ifdef HAVE_CONFIG_H */ -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c index b3d63b09cd..6518264e87 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c @@ -2,7 +2,6 @@ # include #endif /* ifdef HAVE_CONFIG_H */ -#undef alloca #ifdef HAVE_ALLOCA_H # include #elif defined __GNUC__ diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c index 157bfe2fdc..ea17e64e01 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c @@ -6,24 +6,6 @@ # include #endif /* ifdef HAVE_CONFIG_H */ -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c index a1b0bf5ae8..71a933cc52 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c @@ -2,24 +2,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include #include diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c index b6373f9725..97f1d0cc73 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c @@ -6,24 +6,6 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "ecore_x_private.h" #include "ecore_x_randr.h" #include diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c index 997b2bf246..476621a289 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c @@ -2,24 +2,6 @@ # include #endif /* ifdef HAVE_CONFIG_H */ -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c index bfd8497871..a5824532fb 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c @@ -2,24 +2,6 @@ # include #endif /* ifdef HAVE_CONFIG_H */ -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include #include diff --git a/legacy/eio/configure.ac b/legacy/eio/configure.ac index ab74bd9b76..4f14a6aee5 100644 --- a/legacy/eio/configure.ac +++ b/legacy/eio/configure.ac @@ -180,7 +180,6 @@ AC_SUBST(lt_enable_auto_import) ### Checks for library functions AC_CHECK_FUNCS([fchmod chown getpwnam getgrnam]) -AC_FUNC_ALLOCA ### Check for splice system call diff --git a/legacy/eio/src/lib/eio_dir.c b/legacy/eio/src/lib/eio_dir.c index 8a466eaa9c..7bed4fb858 100644 --- a/legacy/eio/src/lib/eio_dir.c +++ b/legacy/eio/src/lib/eio_dir.c @@ -17,10 +17,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_eet.c b/legacy/eio/src/lib/eio_eet.c index a710952997..049c1e39a9 100644 --- a/legacy/eio/src/lib/eio_eet.c +++ b/legacy/eio/src/lib/eio_eet.c @@ -19,10 +19,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_file.c b/legacy/eio/src/lib/eio_file.c index 16cff5c799..31122d0c1f 100644 --- a/legacy/eio/src/lib/eio_file.c +++ b/legacy/eio/src/lib/eio_file.c @@ -19,28 +19,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_main.c b/legacy/eio/src/lib/eio_main.c index 8ea373b3b3..e65f75b0da 100644 --- a/legacy/eio/src/lib/eio_main.c +++ b/legacy/eio/src/lib/eio_main.c @@ -16,11 +16,6 @@ * License along with this library; * if not, see . */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_map.c b/legacy/eio/src/lib/eio_map.c index fca18d6096..9edc0adebf 100644 --- a/legacy/eio/src/lib/eio_map.c +++ b/legacy/eio/src/lib/eio_map.c @@ -19,10 +19,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_monitor.c b/legacy/eio/src/lib/eio_monitor.c index bbf430b248..9f735d63c6 100644 --- a/legacy/eio/src/lib/eio_monitor.c +++ b/legacy/eio/src/lib/eio_monitor.c @@ -17,10 +17,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_monitor_inotify.c b/legacy/eio/src/lib/eio_monitor_inotify.c index 449a6cfd01..b5ffabd81c 100644 --- a/legacy/eio/src/lib/eio_monitor_inotify.c +++ b/legacy/eio/src/lib/eio_monitor_inotify.c @@ -17,28 +17,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_monitor_poll.c b/legacy/eio/src/lib/eio_monitor_poll.c index 6ead0492ca..1f09a427d5 100644 --- a/legacy/eio/src/lib/eio_monitor_poll.c +++ b/legacy/eio/src/lib/eio_monitor_poll.c @@ -17,28 +17,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_monitor_win32.c b/legacy/eio/src/lib/eio_monitor_win32.c index 01e9b6cd68..16dbaa7fdd 100644 --- a/legacy/eio/src/lib/eio_monitor_win32.c +++ b/legacy/eio/src/lib/eio_monitor_win32.c @@ -17,28 +17,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_private.h b/legacy/eio/src/lib/eio_private.h index 6e327a49de..ef983f98a0 100644 --- a/legacy/eio/src/lib/eio_private.h +++ b/legacy/eio/src/lib/eio_private.h @@ -1,6 +1,10 @@ #ifndef EIO_PRIVATE_H_ #define EIO_PRIVATE_H_ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #ifdef HAVE_DIRENT_H # include diff --git a/legacy/eio/src/lib/eio_single.c b/legacy/eio/src/lib/eio_single.c index 2a567d312a..8bc99fa41e 100644 --- a/legacy/eio/src/lib/eio_single.c +++ b/legacy/eio/src/lib/eio_single.c @@ -18,11 +18,6 @@ * License along with this library; * if not, see . */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "eio_private.h" #include "Eio.h" diff --git a/legacy/eio/src/lib/eio_xattr.c b/legacy/eio/src/lib/eio_xattr.c index 8ed768bb38..cff21b92e7 100644 --- a/legacy/eio/src/lib/eio_xattr.c +++ b/legacy/eio/src/lib/eio_xattr.c @@ -17,10 +17,6 @@ * if not, see . */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "eio_private.h" #include "Eio.h"