Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet_private.h eet_data.c eet_dictionary.c eet_image.c
eet_lib.c eet_memfile.c
Log Message:
reorganise header files so that evil is better included. Please test before the
release.
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- Eet_private.h 9 Mar 2008 16:16:40 -0000 1.23
+++ Eet_private.h 28 Mar 2008 17:17:43 -0000 1.24
@@ -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
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- eet_data.c 9 Mar 2008 16:16:40 -0000 1.68
+++ eet_data.c 28 Mar 2008 17:17:43 -0000 1.69
@@ -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"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_dictionary.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eet_dictionary.c 9 Mar 2008 16:16:40 -0000 1.4
+++ eet_dictionary.c 28 Mar 2008 17:17:43 -0000 1.5
@@ -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"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- eet_image.c 8 Mar 2008 07:28:12 -0000 1.18
+++ eet_image.c 28 Mar 2008 17:17:43 -0000 1.19
@@ -3,8 +3,30 @@
*/
#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"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- eet_lib.c 28 Mar 2008 14:37:29 -0000 1.96
+++ eet_lib.c 28 Mar 2008 17:17:43 -0000 1.97
@@ -3,14 +3,50 @@
*/
#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 <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
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_memfile.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- eet_memfile.c 8 Mar 2008 07:28:12 -0000 1.16
+++ eet_memfile.c 28 Mar 2008 17:17:43 -0000 1.17
@@ -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"
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
