[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. 00a54b97536aa9ded13ec8505d14a50a99338b40
doursse
doursse at alioth.debian.org
Sat Jun 7 18:20:30 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit 00a54b97536aa9ded13ec8505d14a50a99338b40
Author: doursse <doursse>
Date: Sat Jun 7 10:06:13 2008 +0000
reorganize header files inclusion. Fix some problems when compiling on Windows
diff --git a/configure.in b/configure.in
index 3324494..40118c6 100644
--- a/configure.in
+++ b/configure.in
@@ -76,6 +76,7 @@ AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ],
PKG_CHECK_MODULES(EDJE, [
evas >= 0.9.9
+ ecore >= 0.9.9
ecore-job >= 0.9.9
eet >= 1.0.1
embryo >= 0.9.1
diff --git a/src/bin/edje_cc_mem.c b/src/bin/edje_cc_mem.c
index 1691d64..074d343 100644
--- a/src/bin/edje_cc_mem.c
+++ b/src/bin/edje_cc_mem.c
@@ -1,3 +1,7 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "edje_cc.h"
void *
diff --git a/src/bin/edje_decc.c b/src/bin/edje_decc.c
index 3ddc473..c5f2225 100644
--- a/src/bin/edje_decc.c
+++ b/src/bin/edje_decc.c
@@ -3,10 +3,10 @@
*/
/* ugly ugly. avert your eyes. */
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <Ecore_File.h>
diff --git a/src/bin/edje_decc.h b/src/bin/edje_decc.h
index 9caacbb..a07a103 100644
--- a/src/bin/edje_decc.h
+++ b/src/bin/edje_decc.h
@@ -3,17 +3,6 @@
#include "edje_main.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdarg.h>
-#include <locale.h>
-#include <ctype.h>
-
/* types */
typedef struct _Font Font;
typedef struct _Font_List Font_List;
diff --git a/src/bin/edje_main.h b/src/bin/edje_main.h
index c659653..195af10 100644
--- a/src/bin/edje_main.h
+++ b/src/bin/edje_main.h
@@ -2,48 +2,16 @@
#define EDJE_MAIN_H
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdarg.h>
-#include <locale.h>
-#include <ctype.h>
-
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
+#include <fcntl.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <sys/mman.h>
-#include <Evas.h>
-#include <Ecore.h>
#include <Ecore_Evas.h>
-#include <Eet.h>
-#include "Edje.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 "edje_private.h"
#include "edje_prefix.h"
diff --git a/src/lib/edje_cache.c b/src/lib/edje_cache.c
index b23f4b7..7853b50 100644
--- a/src/lib/edje_cache.c
+++ b/src/lib/edje_cache.c
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
static Evas_Hash *_edje_file_hash = NULL;
diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
index 972f89b..f62f26a 100644
--- a/src/lib/edje_calc.c
+++ b/src/lib/edje_calc.c
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
#define FLAG_NONE 0
diff --git a/src/lib/edje_callbacks.c b/src/lib/edje_callbacks.c
index 6e8e922..342c1a2 100644
--- a/src/lib/edje_callbacks.c
+++ b/src/lib/edje_callbacks.c
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
void
diff --git a/src/lib/edje_container.c b/src/lib/edje_container.c
index 3bf29ce..9a426cc 100644
--- a/src/lib/edje_container.c
+++ b/src/lib/edje_container.c
@@ -1,4 +1,7 @@
-#include "Edje.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "edje_private.h"
#include "edje_container.h"
diff --git a/src/lib/edje_container.h b/src/lib/edje_container.h
index f9f914b..fd2fb10 100644
--- a/src/lib/edje_container.h
+++ b/src/lib/edje_container.h
@@ -1,4 +1,7 @@
-#include "Edje.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "edje_private.h"
diff --git a/src/lib/edje_data.c b/src/lib/edje_data.c
index f2108d3..5d3ce5e 100644
--- a/src/lib/edje_data.c
+++ b/src/lib/edje_data.c
@@ -1,4 +1,7 @@
-#include "Edje.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "edje_private.h"
EAPI Eet_Data_Descriptor *_edje_edd_edje_file = NULL;
diff --git a/src/lib/edje_edit.c b/src/lib/edje_edit.c
index ae5efca..ee47a51 100644
--- a/src/lib/edje_edit.c
+++ b/src/lib/edje_edit.c
@@ -13,18 +13,8 @@
*
*/
-#include <locale.h>
-#include <errno.h>
-#include <limits.h>
-
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
-#include "Edje.h"
#include "edje_private.h"
#include "edje_cc.h"
-#include "Edje_Edit.h"
/* Get ed(Edje*) from obj(Evas_Object*) */
#define GET_ED_OR_RETURN(RET) \
diff --git a/src/lib/edje_embryo.c b/src/lib/edje_embryo.c
index ebc820b..9acee50 100644
--- a/src/lib/edje_embryo.c
+++ b/src/lib/edje_embryo.c
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
/*
diff --git a/src/lib/edje_load.c b/src/lib/edje_load.c
index 9f3a81d..f28ca6c 100644
--- a/src/lib/edje_load.c
+++ b/src/lib/edje_load.c
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
void _edje_collection_free_part_description_free(Edje_Part_Description *desc, unsigned int free_strings);
diff --git a/src/lib/edje_main.c b/src/lib/edje_main.c
index b5cf19c..6e5ec9f 100644
--- a/src/lib/edje_main.c
+++ b/src/lib/edje_main.c
@@ -2,11 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include <time.h>
-
-#include <Ecore_Job.h>
-
-#include "Edje.h"
#include "edje_private.h"
static int initted = 0;
diff --git a/src/lib/edje_match.c b/src/lib/edje_match.c
index 273d2ac..2fa8dda 100644
--- a/src/lib/edje_match.c
+++ b/src/lib/edje_match.c
@@ -1,8 +1,7 @@
-#include <stdlib.h>
-#include <stddef.h>
-#include <Evas.h>
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
-#include "Edje.h"
#include "edje_private.h"
/* States manipulations. */
diff --git a/src/lib/edje_message_queue.c b/src/lib/edje_message_queue.c
index 915a381..1be342e 100644
--- a/src/lib/edje_message_queue.c
+++ b/src/lib/edje_message_queue.c
@@ -1,5 +1,7 @@
-#include "Edje.h"
-#include <Ecore_Job.h>
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "edje_private.h"
static Ecore_Job *job = NULL;
diff --git a/src/lib/edje_misc.c b/src/lib/edje_misc.c
index 113055c..32a4dd1 100644
--- a/src/lib/edje_misc.c
+++ b/src/lib/edje_misc.c
@@ -1,2 +1 @@
-#include "Edje.h"
#include "edje_private.h"
diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 3e61a9b..14a69e7 100644
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -2,15 +2,26 @@
#define _EDJE_PRIVATE_H
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
-#include <Evas.h>
-#include <Ecore.h>
-#include <Eet.h>
-#include <Embryo.h>
-
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+#include <limits.h>
#include <math.h>
+#include <time.h>
+#include <assert.h>
+#include <locale.h>
+#include <errno.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
@@ -29,40 +40,20 @@ extern "C"
void *alloca (size_t);
#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <limits.h>
+#ifdef HAVE_EVIL
+# include <Evil.h>
+#endif
+#include <Evas.h>
+#include <Ecore.h>
+#include <Ecore_Str.h>
+#include <Ecore_Job.h>
+#include <Eet.h>
+#include <Embryo.h>
-#ifdef EAPI
-# undef EAPI
-#endif
+#include "Edje.h"
+#include "Edje_Edit.h"
-#ifdef _WIN32
-# ifdef EFL_EDJE_BUILD
-# ifdef DLL_EXPORT
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI
-# endif /* ! DLL_EXPORT */
-# else
-# define EAPI __declspec(dllimport)
-# endif /* ! EFL_EDJE_BUILD */
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif
#ifdef __GNUC__
# if __GNUC__ >= 4
diff --git a/src/lib/edje_program.c b/src/lib/edje_program.c
index dc309c3..11784f1 100644
--- a/src/lib/edje_program.c
+++ b/src/lib/edje_program.c
@@ -1,7 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
+
#include "edje_private.h"
static void _edje_emit_cb(Edje *ed, const char *sig, const char *src);
diff --git a/src/lib/edje_script_only.c b/src/lib/edje_script_only.c
index 63e343d..1693cac 100644
--- a/src/lib/edje_script_only.c
+++ b/src/lib/edje_script_only.c
@@ -2,8 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
-#include <Ecore_Job.h>
#include "edje_private.h"
/*
diff --git a/src/lib/edje_smart.c b/src/lib/edje_smart.c
index 19955c2..b4f027f 100644
--- a/src/lib/edje_smart.c
+++ b/src/lib/edje_smart.c
@@ -1,4 +1,7 @@
-#include "Edje.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "edje_private.h"
static void _edje_smart_add(Evas_Object * obj);
diff --git a/src/lib/edje_text.c b/src/lib/edje_text.c
index c8fd9f4..1637a6a 100644
--- a/src/lib/edje_text.c
+++ b/src/lib/edje_text.c
@@ -2,13 +2,8 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#include <assert.h>
/* returns with and height for this part.
*
diff --git a/src/lib/edje_textblock_styles.c b/src/lib/edje_textblock_styles.c
index 4236bd6..3138819 100644
--- a/src/lib/edje_textblock_styles.c
+++ b/src/lib/edje_textblock_styles.c
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
static int
diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 3a715a3..9709e1a 100644
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -1,9 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include <stddef.h>
-#include <Ecore_Str.h>
-#include "Edje.h"
+
#include "edje_private.h"
static Evas_Hash *_edje_color_class_hash = NULL;
diff --git a/src/lib/edje_var.c b/src/lib/edje_var.c
index 50da9bf..af47980 100644
--- a/src/lib/edje_var.c
+++ b/src/lib/edje_var.c
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
static int _edje_var_timer_cb(void *data);
--
Enlightenment DR17 graphical layout and animation library
More information about the Pkg-e-commits
mailing list