From 2a3cdabc41a3ffbc1f75f39d29e04a886ac798ed Mon Sep 17 00:00:00 2001 From: caro Date: Sat, 25 Sep 2010 17:10:33 +0000 Subject: [PATCH] Put everything in edje_private. It should fix a compilation bug on Windows git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@52736 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/edje_cache.c | 24 ------------------------ src/lib/edje_calc.c | 3 --- src/lib/edje_edit.c | 21 --------------------- src/lib/edje_embryo.c | 23 ----------------------- src/lib/edje_entry.c | 24 ------------------------ src/lib/edje_load.c | 2 -- src/lib/edje_lua.c | 23 ----------------------- src/lib/edje_lua2.c | 22 ---------------------- src/lib/edje_lua_script_only.c | 21 --------------------- src/lib/edje_main.c | 2 -- src/lib/edje_match.c | 2 -- src/lib/edje_message_queue.c | 2 -- src/lib/edje_module.c | 34 ---------------------------------- src/lib/edje_private.h | 36 ++++++++++++++++++++++++++++-------- src/lib/edje_program.c | 27 --------------------------- src/lib/edje_script_only.c | 21 --------------------- src/lib/edje_text.c | 2 -- src/lib/edje_textblock_styles.c | 2 -- src/lib/edje_util.c | 3 --- src/lib/edje_var.c | 2 -- 20 files changed, 28 insertions(+), 268 deletions(-) diff --git a/src/lib/edje_cache.c b/src/lib/edje_cache.c index 6fa66a0..b2a0f8c 100644 --- a/src/lib/edje_cache.c +++ b/src/lib/edje_cache.c @@ -1,27 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - -#include -#include - #include "edje_private.h" diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c index 364c7a5..be21e17 100644 --- a/src/lib/edje_calc.c +++ b/src/lib/edje_calc.c @@ -1,6 +1,3 @@ -#include -#include - #include "edje_private.h" #define FLAG_NONE 0 diff --git a/src/lib/edje_edit.c b/src/lib/edje_edit.c index 184211e..22bcebf 100644 --- a/src/lib/edje_edit.c +++ b/src/lib/edje_edit.c @@ -7,27 +7,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include - -#ifndef _MSC_VER -# include -#endif - -#ifdef HAVE_LOCALE_H -# include -#endif - -#ifdef HAVE_EVIL -# include -#endif - #include "edje_private.h" #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT diff --git a/src/lib/edje_embryo.c b/src/lib/edje_embryo.c index 9c602ed..f9d3440 100644 --- a/src/lib/edje_embryo.c +++ b/src/lib/edje_embryo.c @@ -1,26 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "edje_private.h" /* diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c index d273e03..bfd5817 100644 --- a/src/lib/edje_entry.c +++ b/src/lib/edje_entry.c @@ -1,30 +1,6 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - #include "edje_private.h" #ifdef HAVE_ECORE_IMF -#include static int _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos); static Eina_Bool _edje_entry_imf_event_commit_cb(void *data, int type, void *event); diff --git a/src/lib/edje_load.c b/src/lib/edje_load.c index 325af02..660eff0 100644 --- a/src/lib/edje_load.c +++ b/src/lib/edje_load.c @@ -1,5 +1,3 @@ -#include - #include "edje_private.h" #ifdef EDJE_PROGRAM_CACHE diff --git a/src/lib/edje_lua.c b/src/lib/edje_lua.c index a99c364..7b599b9 100644 --- a/src/lib/edje_lua.c +++ b/src/lib/edje_lua.c @@ -1,26 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca(size_t); -#endif - #include "edje_private.h" #if 0 diff --git a/src/lib/edje_lua2.c b/src/lib/edje_lua2.c index 406c260..8484dd5 100644 --- a/src/lib/edje_lua2.c +++ b/src/lib/edje_lua2.c @@ -158,28 +158,6 @@ * @endcode * */ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif - void *alloca(size_t); -#endif #include "edje_private.h" diff --git a/src/lib/edje_lua_script_only.c b/src/lib/edje_lua_script_only.c index e3268ec..e283c83 100644 --- a/src/lib/edje_lua_script_only.c +++ b/src/lib/edje_lua_script_only.c @@ -1,24 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca(size_t); -#endif - #include "edje_private.h" Eina_Bool diff --git a/src/lib/edje_main.c b/src/lib/edje_main.c index bf0c188..6ac0221 100644 --- a/src/lib/edje_main.c +++ b/src/lib/edje_main.c @@ -1,5 +1,3 @@ -#include - #include "edje_private.h" static Edje_Version _version = { VMAJ, VMIN, VMIC, VREV }; diff --git a/src/lib/edje_match.c b/src/lib/edje_match.c index caa7084..8bf7d07 100644 --- a/src/lib/edje_match.c +++ b/src/lib/edje_match.c @@ -1,5 +1,3 @@ -#include - #include "edje_private.h" /* States manipulations. */ diff --git a/src/lib/edje_message_queue.c b/src/lib/edje_message_queue.c index a66ad4b..8640f76 100644 --- a/src/lib/edje_message_queue.c +++ b/src/lib/edje_message_queue.c @@ -1,5 +1,3 @@ -#include - #include "edje_private.h" static int _injob = 0; diff --git a/src/lib/edje_module.c b/src/lib/edje_module.c index 915d6a0..6499290 100644 --- a/src/lib/edje_module.c +++ b/src/lib/edje_module.c @@ -1,37 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - -#include -#include -#include -#include - -#ifdef HAVE_EVIL -# include -#endif - -#include -#include - -#include "Edje.h" #include "edje_private.h" Eina_Hash *_registered_modules = NULL; diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h index 8ffc141..7c70ca6 100644 --- a/src/lib/edje_private.h +++ b/src/lib/edje_private.h @@ -5,6 +5,10 @@ # include #endif +#ifndef _WIN32 +# define _GNU_SOURCE +#endif + #ifdef HAVE_ALLOCA_H # include #elif defined __GNUC__ @@ -19,28 +23,44 @@ void *alloca (size_t); #endif +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#ifndef _MSC_VER +# include +#endif + +#ifdef HAVE_LOCALE_H +# include +#endif + #ifdef HAVE_EVIL # include #endif #include +#include #include #include +#include #ifdef HAVE_ECORE_IMF # include +# include #endif -#include #include -#include -#include #include "Edje.h" -#include -#include -#include -#include - EAPI extern int _edje_default_log_dom ; #ifdef EDJE_DEFAULT_LOG_COLOR diff --git a/src/lib/edje_program.c b/src/lib/edje_program.c index 45a3a2b..209af77 100644 --- a/src/lib/edje_program.c +++ b/src/lib/edje_program.c @@ -1,30 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifndef _WIN32 -# define _GNU_SOURCE -#endif - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - -#include - #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 6a57c02..bd5c0f0 100644 --- a/src/lib/edje_script_only.c +++ b/src/lib/edje_script_only.c @@ -1,24 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca(size_t); -#endif - #include "edje_private.h" /* diff --git a/src/lib/edje_text.c b/src/lib/edje_text.c index 2fdb0c5..a37ad10 100644 --- a/src/lib/edje_text.c +++ b/src/lib/edje_text.c @@ -1,5 +1,3 @@ -#include - #include "edje_private.h" diff --git a/src/lib/edje_textblock_styles.c b/src/lib/edje_textblock_styles.c index d2013af..13a68ad 100644 --- a/src/lib/edje_textblock_styles.c +++ b/src/lib/edje_textblock_styles.c @@ -1,5 +1,3 @@ -#include - #include "edje_private.h" static int diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c index 994eb92..b7dd24a 100644 --- a/src/lib/edje_util.c +++ b/src/lib/edje_util.c @@ -1,6 +1,3 @@ -#include -#include - #include "edje_private.h" typedef struct _Edje_Box_Layout Edje_Box_Layout; diff --git a/src/lib/edje_var.c b/src/lib/edje_var.c index 2bd87e4..3031355 100644 --- a/src/lib/edje_var.c +++ b/src/lib/edje_var.c @@ -1,5 +1,3 @@ -#include - #include "edje_private.h" static Eina_Bool _edje_var_timer_cb(void *data); -- 2.7.4