From a79a4408e4a80f202b987fbe700afa78f469593d Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Fri, 23 Nov 2012 22:09:43 +0000
Subject: [PATCH] Eio: Fix alloca declaration and remove useless autotools
 Windows stuff

SVN revision: 79612
---
 legacy/eio/configure.ac             | 22 +---------------------
 legacy/eio/src/examples/Makefile.am |  2 +-
 legacy/eio/src/lib/Makefile.am      |  4 ++--
 legacy/eio/src/lib/eio_private.h    | 26 ++++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/legacy/eio/configure.ac b/legacy/eio/configure.ac
index 4f14a6aee5..610449e338 100644
--- a/legacy/eio/configure.ac
+++ b/legacy/eio/configure.ac
@@ -105,16 +105,13 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
 ### Checks for libraries
 
-EFL_EIO_BUILD=""
 case "$host_os" in
    mingw*)
       PKG_CHECK_EXISTS([evil >= 1.6.99])
       AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if evil package is installed])
       requirements_eio="${requirements_eio} evil >= 1.6.99"
-      EFL_EIO_BUILD="-DEFL_EIO_BUILD"
    ;;
 esac
-AC_SUBST([EFL_EIO_BUILD])
 
 requirements_eio="${requirements_eio} eet >= 1.6.99 eina >= 1.6.99 ecore >= 1.6.99"
 AC_SUBST([requirements_eio])
@@ -158,27 +155,10 @@ AC_C_INLINE
 AC_C___ATTRIBUTE__
 AM_PROG_CC_C_O
 
-EFL_EIO_BUILD=""
-case "$host_os" in
-   mingw*)
-      EFL_EIO_BUILD="-DEFL_EIO_BUILD"
-   ;;
-esac
-AC_SUBST(EFL_EIO_BUILD)
-
 ### Checks for linker characteristics
 
-# use --enable-auto-import on Windows
-
-lt_enable_auto_import=""
-case "$host_os" in
-   mingw* | cegcc*)
-      lt_enable_auto_import="-Wl,--enable-auto-import"
-      ;;
-esac
-AC_SUBST(lt_enable_auto_import)
-
 ### Checks for library functions
+AC_FUNC_ALLOCA
 AC_CHECK_FUNCS([fchmod chown getpwnam getgrnam])
 
 ### Check for splice system call
diff --git a/legacy/eio/src/examples/Makefile.am b/legacy/eio/src/examples/Makefile.am
index 73a8df7e90..a63b79ad13 100644
--- a/legacy/eio/src/examples/Makefile.am
+++ b/legacy/eio/src/examples/Makefile.am
@@ -8,7 +8,7 @@ files_DATA =
 AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/src/lib/ \
-@EIO_CFLAGS@ @EFL_EIO_BUILD@
+@EIO_CFLAGS@
 
 ECOREBASELDADD = \
 	$(top_builddir)/src/lib/libeio.la \
diff --git a/legacy/eio/src/lib/Makefile.am b/legacy/eio/src/lib/Makefile.am
index 73d3c231a4..8058097167 100644
--- a/legacy/eio/src/lib/Makefile.am
+++ b/legacy/eio/src/lib/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = @EIO_CFLAGS@ \
 @EFL_PTHREAD_CFLAGS@ \
-@EFL_EIO_BUILD@
+-DEFL_EIO_BUILD
 
 lib_LTLIBRARIES = libeio.la
 
@@ -29,6 +29,6 @@ endif
 endif
 
 libeio_la_LIBADD = @EIO_LIBS@ @EFL_PTHREAD_LIBS@
-libeio_la_LDFLAGS  = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
+libeio_la_LDFLAGS  = -no-undefined -version-info @version_info@ @release_info@
 
 EXTRA_DIST = eio_private.h
diff --git a/legacy/eio/src/lib/eio_private.h b/legacy/eio/src/lib/eio_private.h
index ef983f98a0..d57277e9c2 100644
--- a/legacy/eio/src/lib/eio_private.h
+++ b/legacy/eio/src/lib/eio_private.h
@@ -5,6 +5,32 @@
 # include "config.h"
 #endif
 
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif !defined alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif !defined HAVE_ALLOCA
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *alloca (size_t);
+# endif
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>