reorganize header files inclusion. Fix some problems when compiling on Windows

SVN revision: 34768
2008-06-07 10:06:14 +00:00 · 2008-06-07 10:06:14 +00:00 · c5623c01b3
parent e02cf13308
commit c5623c01b3
26 changed files with 67 additions and 133 deletions
--- a/legacy/edje/configure.in
+++ b/legacy/edje/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
--- a/legacy/edje/src/bin/edje_cc_mem.c
+++ b/legacy/edje/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 *
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/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>

--- a/legacy/edje/src/bin/edje_decc.h
+++ b/legacy/edje/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;
--- a/legacy/edje/src/bin/edje_main.h
+++ b/legacy/edje/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"
--- a/legacy/edje/src/lib/edje_cache.c
+++ b/legacy/edje/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;
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/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
--- a/legacy/edje/src/lib/edje_callbacks.c
+++ b/legacy/edje/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
--- a/legacy/edje/src/lib/edje_container.c
+++ b/legacy/edje/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"

--- a/legacy/edje/src/lib/edje_container.h
+++ b/legacy/edje/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"


--- a/legacy/edje/src/lib/edje_data.c
+++ b/legacy/edje/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;
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/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) \
--- a/legacy/edje/src/lib/edje_embryo.c
+++ b/legacy/edje/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"

 /*
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/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);
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/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;
--- a/legacy/edje/src/lib/edje_match.c
+++ b/legacy/edje/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. */
--- a/legacy/edje/src/lib/edje_message_queue.c
+++ b/legacy/edje/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;
--- a/legacy/edje/src/lib/edje_misc.c
+++ b/legacy/edje/src/lib/edje_misc.c
@ -1,2 +1 @@
-#include "Edje.h"
 #include "edje_private.h"
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/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 EAPI
-# undef EAPI
+#ifdef HAVE_EVIL
+# include <Evil.h>
 #endif

-#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
+#include <Evas.h>
+#include <Ecore.h>
+#include <Ecore_Str.h>
+#include <Ecore_Job.h>
+#include <Eet.h>
+#include <Embryo.h>
+
+#include "Edje.h"
+#include "Edje_Edit.h"
+

 #ifdef __GNUC__
 # if __GNUC__ >= 4
--- a/legacy/edje/src/lib/edje_program.c
+++ b/legacy/edje/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);
--- a/legacy/edje/src/lib/edje_script_only.c
+++ b/legacy/edje/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"

 /*
--- a/legacy/edje/src/lib/edje_smart.c
+++ b/legacy/edje/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);
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/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.
 *
--- a/legacy/edje/src/lib/edje_textblock_styles.c
+++ b/legacy/edje/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
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/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;
--- a/legacy/edje/src/lib/edje_var.c
+++ b/legacy/edje/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);