Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_cache.c edje_calc.c edje_callbacks.c edje_container.c
edje_container.h edje_data.c edje_edit.c edje_embryo.c
edje_load.c edje_main.c edje_match.c edje_message_queue.c
edje_misc.c edje_private.h edje_program.c edje_script_only.c
edje_smart.c edje_text.c edje_textblock_styles.c edje_util.c
edje_var.c
Log Message:
reorganize header files inclusion. Fix some problems when compiling on Windows
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_cache.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_cache.c 1 Mar 2008 06:38:09 -0000 1.15
+++ edje_cache.c 7 Jun 2008 10:06:13 -0000 1.16
@@ -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;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- edje_calc.c 10 Apr 2008 08:58:19 -0000 1.126
+++ edje_calc.c 7 Jun 2008 10:06:13 -0000 1.127
@@ -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
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- edje_callbacks.c 4 Apr 2008 00:07:07 -0000 1.30
+++ edje_callbacks.c 7 Jun 2008 10:06:13 -0000 1.31
@@ -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
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_container.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje_container.c 8 Sep 2007 18:31:56 -0000 1.12
+++ edje_container.c 7 Jun 2008 10:06:13 -0000 1.13
@@ -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"
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_container.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_container.h 8 Sep 2007 18:31:56 -0000 1.4
+++ edje_container.h 7 Jun 2008 10:06:13 -0000 1.5
@@ -1,4 +1,7 @@
-#include "Edje.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "edje_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- edje_data.c 30 May 2008 11:20:49 -0000 1.45
+++ edje_data.c 7 Jun 2008 10:06:13 -0000 1.46
@@ -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;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_edit.c 6 Jun 2008 18:31:49 -0000 1.15
+++ edje_edit.c 7 Jun 2008 10:06:13 -0000 1.16
@@ -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) \
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- edje_embryo.c 30 May 2008 11:20:49 -0000 1.63
+++ edje_embryo.c 7 Jun 2008 10:06:13 -0000 1.64
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Edje.h"
#include "edje_private.h"
/*
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- edje_load.c 30 May 2008 14:27:56 -0000 1.126
+++ edje_load.c 7 Jun 2008 10:06:13 -0000 1.127
@@ -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);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- edje_main.c 24 Mar 2008 08:22:01 -0000 1.56
+++ edje_main.c 7 Jun 2008 10:06:13 -0000 1.57
@@ -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;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_match.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_match.c 17 Apr 2008 01:13:48 -0000 1.7
+++ edje_match.c 7 Jun 2008 10:06:13 -0000 1.8
@@ -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. */
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- edje_message_queue.c 30 May 2008 11:20:49 -0000 1.34
+++ edje_message_queue.c 7 Jun 2008 10:06:13 -0000 1.35
@@ -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;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_misc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_misc.c 2 Jul 2004 10:17:25 -0000 1.4
+++ edje_misc.c 7 Jun 2008 10:06:13 -0000 1.5
@@ -1,2 +1 @@
-#include "Edje.h"
#include "edje_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -3 -r1.150 -r1.151
--- edje_private.h 31 May 2008 06:15:41 -0000 1.150
+++ edje_private.h 7 Jun 2008 10:06:13 -0000 1.151
@@ -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 @@
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
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- edje_program.c 13 Mar 2008 06:38:16 -0000 1.60
+++ edje_program.c 7 Jun 2008 10:06:13 -0000 1.61
@@ -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);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_script_only.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_script_only.c 30 May 2008 15:29:39 -0000 1.2
+++ edje_script_only.c 7 Jun 2008 10:06:13 -0000 1.3
@@ -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"
/*
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- edje_smart.c 30 May 2008 11:20:49 -0000 1.34
+++ edje_smart.c 7 Jun 2008 10:06:13 -0000 1.35
@@ -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);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- edje_text.c 6 Apr 2008 02:08:21 -0000 1.71
+++ edje_text.c 7 Jun 2008 10:06:13 -0000 1.72
@@ -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.
*
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- edje_textblock_styles.c 6 Mar 2008 17:52:59 -0000 1.18
+++ edje_textblock_styles.c 7 Jun 2008 10:06:14 -0000 1.19
@@ -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
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- edje_util.c 17 Apr 2008 10:22:57 -0000 1.107
+++ edje_util.c 7 Jun 2008 10:06:14 -0000 1.108
@@ -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;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_var.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- edje_var.c 3 May 2008 05:33:26 -0000 1.22
+++ edje_var.c 7 Jun 2008 10:06:14 -0000 1.23
@@ -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);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
