reorganise header files so that evil is better included. Please test before the release.

SVN revision: 34130

legacy/eet/src/lib/Eet_private.h

@@ -5,48 +5,6 @@
 #ifndef _EET_PRIVATE_H
 #define _EET_PRIVATE_H
 
-#include <stdio.h>
-#include <unistd.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.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>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-#include <ctype.h>
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
-#include <zlib.h>
-#include <string.h>
-#include <fnmatch.h>
-#include <jpeglib.h>
-#include <setjmp.h>
-#include <locale.h>
-
 #ifdef __GNUC__
 # if __GNUC__ >= 4
 // BROKEN in gcc 4 on amd64

legacy/eet/src/lib/eet_data.c

@@ -2,10 +2,21 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
-#include <math.h>
-
 #ifdef HAVE_CONFIG_H
-# include <config.h>  /* so that EAPI in Eet.h is correctly defined */
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <ctype.h>
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef _WIN32
+# include <winsock2.h>
 #endif
 
 #include "Eet.h"

legacy/eet/src/lib/eet_dictionary.c

@@ -2,12 +2,14 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
-#include <math.h>
-
 #ifdef HAVE_CONFIG_H
-# include <config.h>  /* so that EAPI in Eet.h is correctly defined */
+# include <config.h>
 #endif
 
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
 #include "Eet.h"
 #include "Eet_private.h"
 

legacy/eet/src/lib/eet_image.c

@@ -3,9 +3,31 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>  /* so that EAPI in Eet.h is correctly defined */
+# 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 <stdio.h>
+#include <zlib.h>
+#include <jpeglib.h>
+#include <setjmp.h>
+
 #include "Eet.h"
 #include "Eet_private.h"
 

legacy/eet/src/lib/eet_lib.c

@@ -3,15 +3,51 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>  /* so that EAPI in Eet.h is correctly defined */
+# 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 <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <time.h>
+#include <fnmatch.h>
+#include <fcntl.h>
+#include <zlib.h>
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef _WIN32
+# include <winsock2.h>
+#endif
+
+#ifdef HAVE_EVIL
+# include <Evil.h>
 #endif
 
 #include "Eet.h"
 #include "Eet_private.h"
 
-#include <sys/types.h>
-#include <sys/mman.h>
-
 #ifdef HAVE_REALPATH
 #undef HAVE_REALPATH
 #endif

legacy/eet/src/lib/eet_memfile.c

@@ -5,9 +5,11 @@
 #define _GNU_SOURCE
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>  /* so that EAPI in Eet.h is correctly defined */
+# include <config.h>
 #endif
 
+#include <stdio.h>
+
 #include "Eet.h"
 #include "Eet_private.h"