From 92b5baaea40c769a87ed29cec6bca90038e6016c Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Sat, 24 Nov 2012 06:43:00 +0000 Subject: [PATCH] efreet: fix alloca SVN revision: 79629 --- legacy/efreet/ChangeLog | 4 +++ .../efreet/src/bin/efreet_icon_cache_create.c | 26 +------------------ legacy/efreet/src/lib/Makefile.am | 2 +- legacy/efreet/src/lib/efreet.c | 18 +------------ legacy/efreet/src/lib/efreet_base.c | 18 +------------ legacy/efreet/src/lib/efreet_desktop.c | 18 +------------ .../efreet/src/lib/efreet_desktop_command.c | 18 +------------ legacy/efreet/src/lib/efreet_icon.c | 18 +------------ legacy/efreet/src/lib/efreet_ini.c | 18 +------------ legacy/efreet/src/lib/efreet_menu.c | 18 +------------ legacy/efreet/src/lib/efreet_mime.c | 17 +----------- legacy/efreet/src/lib/efreet_utils.c | 20 ++------------ 12 files changed, 16 insertions(+), 179 deletions(-) diff --git a/legacy/efreet/ChangeLog b/legacy/efreet/ChangeLog index 6efe11678b..ad112471d9 100644 --- a/legacy/efreet/ChangeLog +++ b/legacy/efreet/ChangeLog @@ -162,3 +162,7 @@ 2012-11-22 Sebastian Dransfeld * Accept unquoted values in user-dirs.dirs + +2012-11-24 Sebastian Dransfeld + + * Fix alloca diff --git a/legacy/efreet/src/bin/efreet_icon_cache_create.c b/legacy/efreet/src/bin/efreet_icon_cache_create.c index aff62537b4..662dd09469 100644 --- a/legacy/efreet/src/bin/efreet_icon_cache_create.c +++ b/legacy/efreet/src/bin/efreet_icon_cache_create.c @@ -2,31 +2,7 @@ # include #endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# 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 "efreet_alloca.h" #include #include diff --git a/legacy/efreet/src/lib/Makefile.am b/legacy/efreet/src/lib/Makefile.am index 824c8de3fc..f1cc10b436 100644 --- a/legacy/efreet/src/lib/Makefile.am +++ b/legacy/efreet/src/lib/Makefile.am @@ -66,4 +66,4 @@ libefreet_trash_la_CPPFLAGS = \ libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ -EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h +EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h efreet_alloca.h diff --git a/legacy/efreet/src/lib/efreet.c b/legacy/efreet/src/lib/efreet.c index 97f28df513..6899a2b1fa 100644 --- a/legacy/efreet/src/lib/efreet.c +++ b/legacy/efreet/src/lib/efreet.c @@ -2,23 +2,7 @@ # 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 "efreet_alloca.h" #include #include diff --git a/legacy/efreet/src/lib/efreet_base.c b/legacy/efreet/src/lib/efreet_base.c index a4df1480ac..0c0b286c64 100644 --- a/legacy/efreet/src/lib/efreet_base.c +++ b/legacy/efreet/src/lib/efreet_base.c @@ -2,23 +2,7 @@ # 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 "efreet_alloca.h" #include #include diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c index c9edc6ff8a..247251e0bf 100644 --- a/legacy/efreet/src/lib/efreet_desktop.c +++ b/legacy/efreet/src/lib/efreet_desktop.c @@ -2,23 +2,7 @@ # 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 "efreet_alloca.h" #ifdef HAVE_EVIL # include diff --git a/legacy/efreet/src/lib/efreet_desktop_command.c b/legacy/efreet/src/lib/efreet_desktop_command.c index bf97f8fdfa..f7f4d13532 100644 --- a/legacy/efreet/src/lib/efreet_desktop_command.c +++ b/legacy/efreet/src/lib/efreet_desktop_command.c @@ -2,23 +2,7 @@ # 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 "efreet_alloca.h" #include #include diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c index 0a56c2d91f..bcc81176e3 100644 --- a/legacy/efreet/src/lib/efreet_icon.c +++ b/legacy/efreet/src/lib/efreet_icon.c @@ -2,23 +2,7 @@ # 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 "efreet_alloca.h" #include #include diff --git a/legacy/efreet/src/lib/efreet_ini.c b/legacy/efreet/src/lib/efreet_ini.c index 422210fb04..391f0e71c3 100644 --- a/legacy/efreet/src/lib/efreet_ini.c +++ b/legacy/efreet/src/lib/efreet_ini.c @@ -2,23 +2,7 @@ # 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 "efreet_alloca.h" #include diff --git a/legacy/efreet/src/lib/efreet_menu.c b/legacy/efreet/src/lib/efreet_menu.c index fe6ebee007..cccc467ba8 100644 --- a/legacy/efreet/src/lib/efreet_menu.c +++ b/legacy/efreet/src/lib/efreet_menu.c @@ -2,23 +2,7 @@ # 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 "efreet_alloca.h" #include diff --git a/legacy/efreet/src/lib/efreet_mime.c b/legacy/efreet/src/lib/efreet_mime.c index 1e45131184..ee9829d0e2 100644 --- a/legacy/efreet/src/lib/efreet_mime.c +++ b/legacy/efreet/src/lib/efreet_mime.c @@ -2,22 +2,7 @@ # include #endif -#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 "efreet_alloca.h" #include #include diff --git a/legacy/efreet/src/lib/efreet_utils.c b/legacy/efreet/src/lib/efreet_utils.c index 2b732e9001..7037dfd054 100644 --- a/legacy/efreet/src/lib/efreet_utils.c +++ b/legacy/efreet/src/lib/efreet_utils.c @@ -2,25 +2,9 @@ # include #endif -/* TODO: add no_display check, as we might want only displayable items */ +#include "efreet_alloca.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 +/* TODO: add no_display check, as we might want only displayable items */ #include