Hey,
to use evil, I need to include in the following order the headers
config.h
stdio.h
Evil.h
Eet.h
Eet_Private.h
that is, Evil.h must be after stdio.h and config.h, and before Eet.h
Currently, all the headers are in Eet_Private.h and (i think that) it's
impossible to have that order.
So, I've decided to move the headers from Eet_Private.h to the
corresponding source files. Patch is attached. It compiles fine on windows
and linux, with -Wall.
i prefer not commit it before some people (raster ?) review it, and maybe
have a better idea.
regards
Vincent
? eet-0.9.10.041.tar.bz2
? eet-0.9.10.042
? eet-0.9.10.042.tar.bz2
? eet.patch
? eet_headers.diff
? toto
? toto.log
? doc/xml
Index: src/lib/Eet_private.h
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.23
diff -u -r1.23 Eet_private.h
--- src/lib/Eet_private.h 9 Mar 2008 16:16:40 -0000 1.23
+++ src/lib/Eet_private.h 23 Mar 2008 18:40:00 -0000
@@ -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
Index: src/lib/eet_data.c
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.68
diff -u -r1.68 eet_data.c
--- src/lib/eet_data.c 9 Mar 2008 16:16:40 -0000 1.68
+++ src/lib/eet_data.c 23 Mar 2008 18:40:01 -0000
@@ -2,10 +2,21 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
#include <math.h>
+#include <ctype.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h> /* so that EAPI in Eet.h is correctly defined */
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef _WIN32
+# include <winsock2.h>
#endif
#include "Eet.h"
Index: src/lib/eet_dictionary.c
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_dictionary.c,v
retrieving revision 1.4
diff -u -r1.4 eet_dictionary.c
--- src/lib/eet_dictionary.c 9 Mar 2008 16:16:40 -0000 1.4
+++ src/lib/eet_dictionary.c 23 Mar 2008 18:40:01 -0000
@@ -2,11 +2,13 @@
* 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"
Index: src/lib/eet_image.c
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.18
diff -u -r1.18 eet_image.c
--- src/lib/eet_image.c 8 Mar 2008 07:28:12 -0000 1.18
+++ src/lib/eet_image.c 23 Mar 2008 18:40:01 -0000
@@ -3,7 +3,38 @@
*/
#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 <string.h>
+#include <zlib.h>
+#include <jpeglib.h>
+#include <setjmp.h>
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef _WIN32
+# include <winsock2.h>
#endif
#include "Eet.h"
Index: src/lib/eet_lib.c
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.95
diff -u -r1.95 eet_lib.c
--- src/lib/eet_lib.c 9 Mar 2008 16:16:40 -0000 1.95
+++ src/lib/eet_lib.c 23 Mar 2008 18:40:02 -0000
@@ -3,14 +3,51 @@
*/
#ifdef HAVE_CONFIG_H
-# include <config.h> /* so that EAPI in Eet.h is correctly defined */
+# include <config.h>
#endif
-#include "Eet.h"
-#include "Eet_private.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 <stdio.h>
+#include <string.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"
#ifdef HAVE_REALPATH
#undef HAVE_REALPATH
Index: src/lib/eet_memfile.c
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_memfile.c,v
retrieving revision 1.16
diff -u -r1.16 eet_memfile.c
--- src/lib/eet_memfile.c 8 Mar 2008 07:28:12 -0000 1.16
+++ src/lib/eet_memfile.c 23 Mar 2008 18:40:02 -0000
@@ -5,8 +5,10 @@
#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"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
