fix compilation of epp on Windows, plus minor formatting

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@57947 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 0f377ed..1ad482f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -316,7 +316,7 @@ fi
 
 
 ### Checks for header files
-AC_CHECK_HEADERS([locale.h])
+AC_CHECK_HEADERS([locale.h sys/resource.h])
 
 EFL_CHECK_PATH_MAX
 

diff --git a/src/bin/epp/Makefile.am b/src/bin/epp/Makefile.am
index c74430c..6db5016 100644 (file)
--- a/src/bin/epp/Makefile.am
+++ b/src/bin/epp/Makefile.am
@@ -38,6 +38,7 @@ epp_CPPFLAGS = \
 $(CWARNFLAGS)
 
 DEFS= \
+-DHAVE_CONFIG_H \
 -DHAVE_STRERROR \
 -DFATAL_EXIT_CODE=1 \
 -DSUCCESS_EXIT_CODE=0 \

diff --git a/src/bin/epp/cppalloc.c b/src/bin/epp/cppalloc.c
index 2106e1c..4ce0dd0 100644 (file)
--- a/src/bin/epp/cppalloc.c
+++ b/src/bin/epp/cppalloc.c
@@ -23,8 +23,12 @@
  * You are forbidden to forbid anyone else to use, share and improve
  * what you give them.   Help stamp out software-hoarding!  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdlib.h>
-#include "config.h"
+
 #include "cpplib.h"
 
 static void

diff --git a/src/bin/epp/cpperror.c b/src/bin/epp/cpperror.c
index caaa513..f4cd5eb 100644 (file)
--- a/src/bin/epp/cpperror.c
+++ b/src/bin/epp/cpperror.c
@@ -23,9 +23,13 @@
  * You are forbidden to forbid anyone else to use, share and improve
  * what you give them.   Help stamp out software-hoarding!  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
+
 #include "cpplib.h"
 
 /* Print the file names and line numbers of the #include

diff --git a/src/bin/epp/cppexp.c b/src/bin/epp/cppexp.c
index 507fec3..5fcb33f 100644 (file)
--- a/src/bin/epp/cppexp.c
+++ b/src/bin/epp/cppexp.c
@@ -24,22 +24,25 @@
 
 /* Parse a C expression from text in a string  */
 
-#include "config.h"
-#include "cpplib.h"
-#include "cpphash.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #ifdef __EMX__
-#include <strings.h>
+# include <strings.h>
 #endif
 
 #ifdef MULTIBYTE_CHARS
-#include <locale.h>
+# include <locale.h>
 #endif
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "cpplib.h"
+#include "cpphash.h"
+
 /* This is used for communicating lists of keywords with cccp.c.  */
 struct arglist {
    struct arglist     *next;

diff --git a/src/bin/epp/cpphash.c b/src/bin/epp/cpphash.c
index 8545b9a..e3b68e0 100644 (file)
--- a/src/bin/epp/cpphash.c
+++ b/src/bin/epp/cpphash.c
@@ -23,15 +23,18 @@
  * You are forbidden to forbid anyone else to use, share and improve
  * what you give them.   Help stamp out software-hoarding!  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
 #include "cpplib.h"
 #include "cpphash.h"
 
 static HASHNODE    *hashtab[HASHSIZE];
 
-#include <string.h>
-#include <stdlib.h>
-
 #define IS_IDCHAR(ch) is_idchar[(unsigned char)(ch)]
 
 /*

diff --git a/src/bin/epp/cpplib.c b/src/bin/epp/cpplib.c
index d5db450..0e5b47a 100644 (file)
--- a/src/bin/epp/cpplib.c
+++ b/src/bin/epp/cpplib.c
@@ -23,9 +23,23 @@
  * You are forbidden to forbid anyone else to use, share and improve
  * what you give them.   Help stamp out software-hoarding!  */
 
-const char         *version_string = "0.0.0";
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
-#include "config.h"
+#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>
+void *alloca (size_t);
+#endif
 
 #ifdef __EMX__
 #include <strings.h>
@@ -42,6 +56,8 @@ const char         *version_string = "0.0.0";
 #include "cpplib.h"
 #include "cpphash.h"
 
+const char         *version_string = "0.0.0";
+
 #ifndef STDC_VALUE
 #define STDC_VALUE 1
 #endif
@@ -55,12 +71,7 @@ const char         *version_string = "0.0.0";
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -71,7 +82,9 @@ const char         *version_string = "0.0.0";
 #ifndef USG
 #include <time.h>
 #include <sys/time.h>          /* for __DATE__ and __TIME__ */
-#include <sys/resource.h>
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
 #else
 #include <sys/param.h>         /* CYGNUS LOCAL: shebs -noquiet */
 #include <sys/times.h>

diff --git a/src/bin/epp/cppmain.c b/src/bin/epp/cppmain.c
index 543d418..fdcc00c 100644 (file)
--- a/src/bin/epp/cppmain.c
+++ b/src/bin/epp/cppmain.c
@@ -21,11 +21,14 @@
  * You are forbidden to forbid anyone else to use, share and improve
  * what you give them.   Help stamp out software-hoarding!  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include "config.h"
 #include "cpplib.h"
 
 #define EPP_DEBUG 0