efreet: fix alloca

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/efreet-1.7@79628 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index dcf9e5f..9e74376 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -152,3 +152,6 @@
 
         1.7.2 release
 
+2012-11-24  Sebastian Dransfeld
+
+       * Fix alloca

diff --git a/src/bin/efreet_icon_cache_create.c b/src/bin/efreet_icon_cache_create.c
index e8d100c..e2ec227 100644 (file)
--- a/src/bin/efreet_icon_cache_create.c
+++ b/src/bin/efreet_icon_cache_create.c
@@ -1,6 +1,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "efreet_alloca.h"
+
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 824c8de..f1cc10b 100644 (file)
--- a/src/lib/Makefile.am
+++ b/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/src/lib/efreet.c b/src/lib/efreet.c
index c48223f..8d3bf57 100644 (file)
--- a/src/lib/efreet.c
+++ b/src/lib/efreet.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <unistd.h>
 #include <sys/stat.h>

diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c
index 6ee0119..cf1bb9b 100644 (file)
--- a/src/lib/efreet_base.c
+++ b/src/lib/efreet_base.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <unistd.h>
 #include <ctype.h>

diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index 9293f94..7faf43c 100644 (file)
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #ifdef HAVE_EVIL
 # include <Evil.h>

diff --git a/src/lib/efreet_desktop_command.c b/src/lib/efreet_desktop_command.c
index bf97f8f..f7f4d13 100644 (file)
--- a/src/lib/efreet_desktop_command.c
+++ b/src/lib/efreet_desktop_command.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <unistd.h>
 #include <ctype.h>

diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c
index 526e0ec..86a669a 100644 (file)
--- a/src/lib/efreet_icon.c
+++ b/src/lib/efreet_icon.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <Ecore.h>
 #include <Ecore_File.h>

diff --git a/src/lib/efreet_ini.c b/src/lib/efreet_ini.c
index 375fda1..fbe4dd7 100644 (file)
--- a/src/lib/efreet_ini.c
+++ b/src/lib/efreet_ini.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <ctype.h>
 #include <sys/stat.h>

diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
index e612ba1..3ab6c5c 100644 (file)
--- a/src/lib/efreet_menu.c
+++ b/src/lib/efreet_menu.c
@@ -2,23 +2,7 @@
 # include <config.h>
 #endif
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <Ecore_File.h>
 

diff --git a/src/lib/efreet_mime.c b/src/lib/efreet_mime.c
index 9343d90..51be95f 100644 (file)
--- a/src/lib/efreet_mime.c
+++ b/src/lib/efreet_mime.c
@@ -2,22 +2,7 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+#include "efreet_alloca.h"
 
 #include <ctype.h>
 #include <sys/stat.h>

diff --git a/src/lib/efreet_utils.c b/src/lib/efreet_utils.c
index dab85ef..a2bee37 100644 (file)
--- a/src/lib/efreet_utils.c
+++ b/src/lib/efreet_utils.c
@@ -2,25 +2,9 @@
 # include <config.h>
 #endif
 
-/* TODO: add no_display check, as we might want only displayable items */
+#include "efreet_alloca.h"
 
-#undef alloca
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
+/* TODO: add no_display check, as we might want only displayable items */
 
 #include <fnmatch.h>