From e18508b701575e721cab8f3adf187ed912f9bd8c Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 31 Jan 2009 18:33:39 +0000 Subject: [PATCH] remove a bit the mess n ecore. It's just the first patch... * add vim header * include config.h when necessary * fix the order of some include * move the standard header in ecore_private.h to the source files I have recompiled all the efl and e17, and e17 seems to work fine with these changes. If you encounter problems with that commit, let me know. SVN revision: 38864 --- legacy/ecore/configure.ac | 1 + legacy/ecore/src/lib/ecore/Ecore_Getopt.h | 2 +- legacy/ecore/src/lib/ecore/Makefile.am | 8 ++-- legacy/ecore/src/lib/ecore/ecore.c | 18 ++++++++- legacy/ecore/src/lib/ecore/ecore_anim.c | 10 +++++ legacy/ecore/src/lib/ecore/ecore_app.c | 7 ++++ legacy/ecore/src/lib/ecore/ecore_events.c | 10 +++++ legacy/ecore/src/lib/ecore/ecore_exe.c | 18 ++++++++- legacy/ecore/src/lib/ecore/ecore_getopt.c | 39 ++++++++++--------- legacy/ecore/src/lib/ecore/ecore_hash.c | 23 ++++++++--- .../ecore/src/lib/ecore/ecore_idle_enterer.c | 10 +++++ .../ecore/src/lib/ecore/ecore_idle_exiter.c | 10 +++++ legacy/ecore/src/lib/ecore/ecore_idler.c | 10 +++++ legacy/ecore/src/lib/ecore/ecore_list.c | 11 ++++++ legacy/ecore/src/lib/ecore/ecore_main.c | 2 + legacy/ecore/src/lib/ecore/ecore_path.c | 7 ++++ legacy/ecore/src/lib/ecore/ecore_pipe.c | 1 + legacy/ecore/src/lib/ecore/ecore_plugin.c | 10 ++++- legacy/ecore/src/lib/ecore/ecore_poll.c | 10 +++++ legacy/ecore/src/lib/ecore/ecore_private.h | 22 +---------- legacy/ecore/src/lib/ecore/ecore_sheap.c | 11 ++++++ legacy/ecore/src/lib/ecore/ecore_signal.c | 11 ++++++ legacy/ecore/src/lib/ecore/ecore_str.c | 12 +++++- legacy/ecore/src/lib/ecore/ecore_strbuf.c | 10 +++++ legacy/ecore/src/lib/ecore/ecore_time.c | 2 + legacy/ecore/src/lib/ecore/ecore_timer.c | 11 ++++++ legacy/ecore/src/lib/ecore/ecore_tree.c | 10 +++++ legacy/ecore/src/lib/ecore/ecore_value.c | 17 ++++++-- legacy/ecore/src/lib/ecore_con/Ecore_Con.h | 19 ++++----- legacy/ecore/src/lib/ecore_con/ecore_con.c | 8 +++- .../ecore/src/lib/ecore_con/ecore_con_dns.c | 13 +++++-- .../ecore/src/lib/ecore_con/ecore_con_info.c | 13 +++++-- .../ecore/src/lib/ecore_con/ecore_con_ssl.c | 6 ++- .../ecore/src/lib/ecore_con/ecore_con_url.c | 16 +++++--- .../ecore/src/lib/ecore_config/ecore_config.c | 9 ++++- .../src/lib/ecore_config/ecore_config_db.c | 11 +++++- .../src/lib/ecore_config/ecore_config_extra.c | 10 ++++- .../lib/ecore_config/ecore_config_ipc_ecore.c | 9 ++++- .../lib/ecore_config/ecore_config_ipc_main.c | 9 ++++- .../lib/ecore_config/ecore_config_storage.c | 8 ++++ .../src/lib/ecore_config/ecore_config_util.c | 9 +++++ .../src/lib/ecore_directfb/Ecore_DirectFB.h | 6 +-- .../src/lib/ecore_directfb/ecore_directfb.c | 15 +++++-- legacy/ecore/src/lib/ecore_evas/ecore_evas.c | 6 ++- .../src/lib/ecore_evas/ecore_evas_directfb.c | 11 +++++- .../ecore/src/lib/ecore_evas/ecore_evas_fb.c | 9 ++++- .../src/lib/ecore_evas/ecore_evas_quartz.c | 9 ++++- .../ecore/src/lib/ecore_evas/ecore_evas_sdl.c | 9 ++++- .../src/lib/ecore_evas/ecore_evas_util.c | 6 +++ .../ecore/src/lib/ecore_evas/ecore_evas_x.c | 2 + legacy/ecore/src/lib/ecore_fb/ecore_fb.c | 8 ++++ legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c | 8 ++++ .../ecore/src/lib/ecore_fb/ecore_fb_private.h | 1 + legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c | 18 ++++++--- legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c | 8 ++++ legacy/ecore/src/lib/ecore_file/ecore_file.c | 7 ++++ .../src/lib/ecore_file/ecore_file_download.c | 3 ++ .../ecore_file/ecore_file_monitor_inotify.c | 3 ++ .../lib/ecore_file/ecore_file_monitor_poll.c | 3 ++ .../src/lib/ecore_file/ecore_file_path.c | 3 ++ legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h | 4 +- legacy/ecore/src/lib/ecore_imf/ecore_imf.c | 8 ++-- .../src/lib/ecore_imf/ecore_imf_context.c | 13 ++++--- .../src/lib/ecore_imf/ecore_imf_module.c | 9 +++-- legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h | 7 ++-- legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c | 10 ++++- legacy/ecore/src/lib/ecore_job/ecore_job.c | 5 +++ legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c | 8 ++++ legacy/ecore/src/lib/ecore_txt/ecore_txt.c | 9 +++-- legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c | 7 ++++ .../src/lib/ecore_x/xlib/ecore_x_atoms.c | 22 ++++++++++- .../src/lib/ecore_x/xlib/ecore_x_composite.c | 5 +++ .../src/lib/ecore_x/xlib/ecore_x_cursor.c | 10 +++++ .../src/lib/ecore_x/xlib/ecore_x_damage.c | 5 +++ .../ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c | 8 ++++ .../ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c | 4 ++ .../src/lib/ecore_x/xlib/ecore_x_drawable.c | 4 ++ legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c | 6 +++ .../src/lib/ecore_x/xlib/ecore_x_error.c | 10 +++++ .../src/lib/ecore_x/xlib/ecore_x_events.c | 7 ++++ .../src/lib/ecore_x/xlib/ecore_x_fixes.c | 6 +++ .../ecore/src/lib/ecore_x/xlib/ecore_x_gc.c | 8 ++++ .../src/lib/ecore_x/xlib/ecore_x_icccm.c | 10 ++++- .../ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c | 13 ++++++- .../src/lib/ecore_x/xlib/ecore_x_netwm.c | 6 +++ .../src/lib/ecore_x/xlib/ecore_x_pixmap.c | 8 ++++ .../src/lib/ecore_x/xlib/ecore_x_private.h | 2 - .../src/lib/ecore_x/xlib/ecore_x_randr.c | 6 +++ .../lib/ecore_x/xlib/ecore_x_screensaver.c | 6 +++ .../src/lib/ecore_x/xlib/ecore_x_selection.c | 7 ++++ .../ecore/src/lib/ecore_x/xlib/ecore_x_sync.c | 6 +++ .../ecore/src/lib/ecore_x/xlib/ecore_x_test.c | 10 +++++ .../src/lib/ecore_x/xlib/ecore_x_window.c | 7 ++++ .../lib/ecore_x/xlib/ecore_x_window_prop.c | 7 ++++ .../lib/ecore_x/xlib/ecore_x_window_shape.c | 10 +++++ .../src/lib/ecore_x/xlib/ecore_x_xinerama.c | 6 +++ 96 files changed, 737 insertions(+), 130 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index ea229c0968..fc2e4c55ac 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -116,6 +116,7 @@ AC_SUBST(lt_enable_auto_import) dnl check common functions and headers AC_CHECK_FUNCS(gettimeofday) AC_CHECK_FUNCS(strlcpy) +AC_FUNC_ALLOCA dnl gnutls want_gnutls="yes" diff --git a/legacy/ecore/src/lib/ecore/Ecore_Getopt.h b/legacy/ecore/src/lib/ecore/Ecore_Getopt.h index a8b579dc8b..41834def63 100644 --- a/legacy/ecore/src/lib/ecore/Ecore_Getopt.h +++ b/legacy/ecore/src/lib/ecore/Ecore_Getopt.h @@ -1,8 +1,8 @@ #ifndef _ECORE_GETOPT_H #define _ECORE_GETOPT_H -#include #include +#include #ifdef EAPI # undef EAPI diff --git a/legacy/ecore/src/lib/ecore/Makefile.am b/legacy/ecore/src/lib/ecore/Makefile.am index 245098a3a9..c15863f4fc 100644 --- a/legacy/ecore/src/lib/ecore/Makefile.am +++ b/legacy/ecore/src/lib/ecore/Makefile.am @@ -12,10 +12,11 @@ Ecore_Getopt.h libecore_la_SOURCES = \ ecore.c \ -ecore_app.c \ ecore_anim.c \ +ecore_app.c \ ecore_events.c \ ecore_exe.c \ +ecore_getopt.c \ ecore_hash.c \ ecore_idle_enterer.c \ ecore_idle_exiter.c \ @@ -25,6 +26,7 @@ ecore_main.c \ ecore_path.c \ ecore_pipe.c \ ecore_plugin.c \ +ecore_poll.c \ ecore_sheap.c \ ecore_signal.c \ ecore_str.c \ @@ -32,9 +34,7 @@ ecore_strbuf.c \ ecore_time.c \ ecore_timer.c \ ecore_tree.c \ -ecore_value.c \ -ecore_poll.c \ -ecore_getopt.c +ecore_value.c libecore_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ -lm libecore_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c index e4e32446f4..2b5c476c34 100644 --- a/legacy/ecore/src/lib/ecore/ecore.c +++ b/legacy/ecore/src/lib/ecore/ecore.c @@ -1,7 +1,17 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifdef HAVE_CONFIG_H # include #endif +#include +#include +#include +#include +#include + #ifdef HAVE_LOCALE_H # include #endif @@ -10,14 +20,18 @@ # include #endif -#include "Ecore.h" -#include "ecore_private.h" +#ifdef HAVE_SYS_MMAN_H +# include +#endif #ifdef HAVE_EVIL # include #endif #include +#include "Ecore.h" +#include "ecore_private.h" + static const char *_ecore_magic_string_get(Ecore_Magic m); static int _ecore_init_count = 0; diff --git a/legacy/ecore/src/lib/ecore/ecore_anim.c b/legacy/ecore/src/lib/ecore/ecore_anim.c index d5d4e9e9ed..75d1c99ccb 100644 --- a/legacy/ecore/src/lib/ecore/ecore_anim.c +++ b/legacy/ecore/src/lib/ecore/ecore_anim.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_app.c b/legacy/ecore/src/lib/ecore/ecore_app.c index 7858c76085..9801a35caa 100644 --- a/legacy/ecore/src/lib/ecore/ecore_app.c +++ b/legacy/ecore/src/lib/ecore/ecore_app.c @@ -1,7 +1,14 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifdef HAVE_CONFIG_H # include #endif +#include +#include + #ifdef HAVE_EVIL # include #endif diff --git a/legacy/ecore/src/lib/ecore/ecore_events.c b/legacy/ecore/src/lib/ecore/ecore_events.c index 0035f6318f..a1955f815e 100644 --- a/legacy/ecore/src/lib/ecore/ecore_events.c +++ b/legacy/ecore/src/lib/ecore/ecore_events.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_exe.c b/legacy/ecore/src/lib/ecore/ecore_exe.c index f95ab7b063..79b7533a31 100644 --- a/legacy/ecore/src/lib/ecore/ecore_exe.c +++ b/legacy/ecore/src/lib/ecore/ecore_exe.c @@ -1,7 +1,23 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include #include +#include +#include +#include + #ifdef HAVE_SYS_WAIT_H # include -#endif /* HAVE_SYS_WAIT_H */ +#endif + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_getopt.c b/legacy/ecore/src/lib/ecore/ecore_getopt.c index 44c02979f6..fc897c81d6 100644 --- a/legacy/ecore/src/lib/ecore/ecore_getopt.c +++ b/legacy/ecore/src/lib/ecore/ecore_getopt.c @@ -1,3 +1,7 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifdef HAVE_CONFIG_H # include #endif @@ -7,8 +11,7 @@ #include #include -#include - +#include "Ecore.h" #include "Ecore_Getopt.h" static const char *prog = NULL; @@ -18,7 +21,7 @@ static int cols = 80; static int helpcol = 80 / 3; static void -_ecore_getopt_help_print_replace_program(FILE *fp, const Ecore_Getopt *parser, const char *text) +_ecore_getopt_help_print_replace_program(FILE *fp, const Ecore_Getopt *parser __UNUSED__, const char *text) { do { @@ -321,7 +324,7 @@ _ecore_getopt_help_desc_store(FILE *fp, const int base, const int total, int use const Ecore_Getopt_Desc_Store *store = &desc->action_param.store; char buf[64]; const char *str; - int len; + size_t len; fputc('\n', fp); for (used = 0; used < base; used++) @@ -802,7 +805,7 @@ _ecore_getopt_parse_double(const char *str, double *v) } static unsigned char -_ecore_getopt_parse_store(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *value, const char *arg_val) +_ecore_getopt_parse_store(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *value, const char *arg_val) { const Ecore_Getopt_Desc_Store *store = &desc->action_param.store; long int v; @@ -922,7 +925,7 @@ _ecore_getopt_parse_store(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *d } static unsigned char -_ecore_getopt_parse_store_const(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_store_const(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (!val->ptrp) { @@ -935,7 +938,7 @@ _ecore_getopt_parse_store_const(const Ecore_Getopt *parser, const Ecore_Getopt_D } static unsigned char -_ecore_getopt_parse_store_true(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_store_true(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (!val->boolp) { @@ -947,7 +950,7 @@ _ecore_getopt_parse_store_true(const Ecore_Getopt *parser, const Ecore_Getopt_De } static unsigned char -_ecore_getopt_parse_store_false(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_store_false(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (!val->boolp) { @@ -959,7 +962,7 @@ _ecore_getopt_parse_store_false(const Ecore_Getopt *parser, const Ecore_Getopt_D } static unsigned char -_ecore_getopt_parse_choice(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_choice(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) { const char * const *pchoice; @@ -993,7 +996,7 @@ _ecore_getopt_parse_choice(const Ecore_Getopt *parser, const Ecore_Getopt_Desc * } static unsigned char -_ecore_getopt_parse_append(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_append(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) { void *data; long int v; @@ -1113,7 +1116,7 @@ _ecore_getopt_parse_append(const Ecore_Getopt *parser, const Ecore_Getopt_Desc * } static unsigned char -_ecore_getopt_parse_count(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_count(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (!val->intp) { @@ -1169,7 +1172,7 @@ _ecore_getopt_parse_callback(const Ecore_Getopt *parser, const Ecore_Getopt_Desc } static unsigned char -_ecore_getopt_parse_help(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_help(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc __UNUSED__, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (val->boolp) (*val->boolp) = 1; @@ -1178,7 +1181,7 @@ _ecore_getopt_parse_help(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *de } static unsigned char -_ecore_getopt_parse_version(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_version(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (val->boolp) (*val->boolp) = 1; @@ -1192,7 +1195,7 @@ _ecore_getopt_parse_version(const Ecore_Getopt *parser, const Ecore_Getopt_Desc } static unsigned char -_ecore_getopt_parse_copyright(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_copyright(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (val->boolp) (*val->boolp) = 1; @@ -1206,7 +1209,7 @@ _ecore_getopt_parse_copyright(const Ecore_Getopt *parser, const Ecore_Getopt_Des } static unsigned char -_ecore_getopt_parse_license(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val) +_ecore_getopt_parse_license(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__) { if (val->boolp) (*val->boolp) = 1; @@ -1254,7 +1257,7 @@ _ecore_getopt_desc_handle(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *d } static unsigned char -_ecore_getopt_parse_arg_long(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int *idx, int *nonargs, const char *arg) +_ecore_getopt_parse_arg_long(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc __UNUSED__, char **argv, int *idx, int *nonargs, const char *arg) { const Ecore_Getopt_Desc *desc; Ecore_Getopt_Desc_Arg_Requirement arg_req; @@ -1317,7 +1320,7 @@ _ecore_getopt_parse_arg_long(const Ecore_Getopt *parser, Ecore_Getopt_Value *val } static unsigned char -_ecore_getopt_parse_arg_short(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int *idx, int *nonargs, const char *arg) +_ecore_getopt_parse_arg_short(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc __UNUSED__, char **argv, int *idx, int *nonargs, const char *arg) { int run = 1; while (run && (arg[0] != '\0')) @@ -1649,7 +1652,7 @@ ecore_getopt_list_free(Eina_List *list) * @c callback_data value is ignored, you can safely use @c NULL. */ unsigned char -ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage) +ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc __UNUSED__, const char *str, void *data __UNUSED__, Ecore_Getopt_Value *storage) { Eina_Rectangle *v = (Eina_Rectangle *)storage->ptrp; diff --git a/legacy/ecore/src/lib/ecore/ecore_hash.c b/legacy/ecore/src/lib/ecore/ecore_hash.c index b52c648cd7..90e0cbace7 100644 --- a/legacy/ecore/src/lib/ecore/ecore_hash.c +++ b/legacy/ecore/src/lib/ecore/ecore_hash.c @@ -1,3 +1,14 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + #include "ecore_private.h" #include "Ecore.h" #include "Ecore_Data.h" @@ -413,7 +424,7 @@ _ecore_hash_bucket_destroy(Ecore_Hash_Node *list, Ecore_Free_Cb keyd, Ecore_Free static int _ecore_hash_node_add(Ecore_Hash *hash, Ecore_Hash_Node *node) { - unsigned int hash_val; + unsigned long hash_val; CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE); CHECK_PARAM_POINTER_RETURN("node", node, FALSE); @@ -424,7 +435,7 @@ _ecore_hash_node_add(Ecore_Hash *hash, Ecore_Hash_Node *node) /* Compute the position in the table */ if (!hash->hash_func) - hash_val = (unsigned int)node->key % ecore_prime_table[hash->size]; + hash_val = (unsigned long)node->key % ecore_prime_table[hash->size]; else hash_val = ECORE_COMPUTE_HASH(hash, node->key); @@ -475,14 +486,14 @@ ecore_hash_remove(Ecore_Hash *hash, const void *key) { Ecore_Hash_Node *node = NULL; Ecore_Hash_Node *list; - unsigned int hash_val; + unsigned long hash_val; void *ret = NULL; CHECK_PARAM_POINTER_RETURN("hash", hash, NULL); /* Compute the position in the table */ if (!hash->hash_func) - hash_val = (unsigned int )key % ecore_prime_table[hash->size]; + hash_val = (unsigned long )key % ecore_prime_table[hash->size]; else hash_val = ECORE_COMPUTE_HASH(hash, key); @@ -580,7 +591,7 @@ ecore_hash_find(Ecore_Hash *hash, Ecore_Compare_Cb compare, const void *value) static Ecore_Hash_Node * _ecore_hash_node_get(Ecore_Hash *hash, const void *key) { - unsigned int hash_val; + unsigned long hash_val; Ecore_Hash_Node *node = NULL; CHECK_PARAM_POINTER_RETURN("hash", hash, NULL); @@ -592,7 +603,7 @@ _ecore_hash_node_get(Ecore_Hash *hash, const void *key) /* Compute the position in the table */ if (!hash->hash_func) - hash_val = (unsigned int )key % ecore_prime_table[hash->size]; + hash_val = (unsigned long)key % ecore_prime_table[hash->size]; else hash_val = ECORE_COMPUTE_HASH(hash, key); diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c b/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c index 309aea255c..bdbb371825 100644 --- a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c +++ b/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c b/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c index a0217811df..c9ff5722ac 100644 --- a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c +++ b/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_idler.c b/legacy/ecore/src/lib/ecore/ecore_idler.c index ffad4705ad..48fc941372 100644 --- a/legacy/ecore/src/lib/ecore/ecore_idler.c +++ b/legacy/ecore/src/lib/ecore/ecore_idler.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_list.c b/legacy/ecore/src/lib/ecore/ecore_list.c index 36ef5068ec..f129bf2471 100644 --- a/legacy/ecore/src/lib/ecore/ecore_list.c +++ b/legacy/ecore/src/lib/ecore/ecore_list.c @@ -1,3 +1,14 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + #include "ecore_private.h" #include "Ecore.h" #include "Ecore_Data.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c index 6c74906481..6883d1f7e1 100644 --- a/legacy/ecore/src/lib/ecore/ecore_main.c +++ b/legacy/ecore/src/lib/ecore/ecore_main.c @@ -11,6 +11,8 @@ # define USER_TIMER_MINIMUM 0x0a #endif +#include +#include #include #include #include diff --git a/legacy/ecore/src/lib/ecore/ecore_path.c b/legacy/ecore/src/lib/ecore/ecore_path.c index 5ced49e5da..ea1431e091 100644 --- a/legacy/ecore/src/lib/ecore/ecore_path.c +++ b/legacy/ecore/src/lib/ecore/ecore_path.c @@ -6,6 +6,13 @@ # include #endif +#include +#include +#include +#include +#include +#include + #include "ecore_private.h" #include "Ecore_Data.h" #include "Ecore_Str.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/legacy/ecore/src/lib/ecore/ecore_pipe.c index 4f435d2ffe..f6e4778f1a 100644 --- a/legacy/ecore/src/lib/ecore/ecore_pipe.c +++ b/legacy/ecore/src/lib/ecore/ecore_pipe.c @@ -7,6 +7,7 @@ #endif #include +#include #include #ifdef HAVE_EVIL diff --git a/legacy/ecore/src/lib/ecore/ecore_plugin.c b/legacy/ecore/src/lib/ecore/ecore_plugin.c index 7004a380ba..0162a27b68 100644 --- a/legacy/ecore/src/lib/ecore/ecore_plugin.c +++ b/legacy/ecore/src/lib/ecore/ecore_plugin.c @@ -8,13 +8,19 @@ #include #include +#include +#include +#include +#include +#include + #ifdef HAVE_DLFCN_H # include #endif #ifdef HAVE_EVIL_H -# include +# include #endif #include "Ecore_Data.h" @@ -251,7 +257,7 @@ ecore_plugin_available_get(Ecore_Path_Group *group) } static Eina_Bool -_hash_keys(const Eina_Hash *hash, const char *key, void *list) +_hash_keys(const Eina_Hash *hash __UNUSED__, const char *key, void *list) { ecore_list_append(list, strdup(key)); return EINA_TRUE; diff --git a/legacy/ecore/src/lib/ecore/ecore_poll.c b/legacy/ecore/src/lib/ecore/ecore_poll.c index bb4565372c..3143a9075c 100644 --- a/legacy/ecore/src/lib/ecore/ecore_poll.c +++ b/legacy/ecore/src/lib/ecore/ecore_poll.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h index 7610bade2d..0188d2722d 100644 --- a/legacy/ecore/src/lib/ecore/ecore_private.h +++ b/legacy/ecore/src/lib/ecore/ecore_private.h @@ -1,32 +1,12 @@ #ifndef _ECORE_PRIVATE_H #define _ECORE_PRIVATE_H -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include #include #include + #ifdef HAVE_SIGNAL_H # include #endif -#include -#include -#include -#include -#ifdef HAVE_SYS_RESOURCE_H -# include -#endif - -#include - -#ifdef HAVE_SYS_MMAN_H -# include -#endif #ifdef EAPI # undef EAPI diff --git a/legacy/ecore/src/lib/ecore/ecore_sheap.c b/legacy/ecore/src/lib/ecore/ecore_sheap.c index 3e430a3fcf..31df8750a7 100644 --- a/legacy/ecore/src/lib/ecore/ecore_sheap.c +++ b/legacy/ecore/src/lib/ecore/ecore_sheap.c @@ -1,3 +1,14 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + #include "ecore_private.h" #include "Ecore.h" #include "Ecore_Data.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_signal.c b/legacy/ecore/src/lib/ecore/ecore_signal.c index 5f97c302c9..baa572c335 100644 --- a/legacy/ecore/src/lib/ecore/ecore_signal.c +++ b/legacy/ecore/src/lib/ecore/ecore_signal.c @@ -1,9 +1,20 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifndef _WIN32 + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include #include #include #include #include #include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_str.c b/legacy/ecore/src/lib/ecore/ecore_str.c index c483a33b42..1682229152 100644 --- a/legacy/ecore/src/lib/ecore/ecore_str.c +++ b/legacy/ecore/src/lib/ecore/ecore_str.c @@ -17,8 +17,18 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include #include +#include +#include #include "ecore_private.h" #include "Ecore_Str.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_strbuf.c b/legacy/ecore/src/lib/ecore/ecore_strbuf.c index 4d36356df2..3e3e5ea400 100644 --- a/legacy/ecore/src/lib/ecore/ecore_strbuf.c +++ b/legacy/ecore/src/lib/ecore/ecore_strbuf.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" #include "Ecore_Data.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_time.c b/legacy/ecore/src/lib/ecore/ecore_time.c index 855f72cd2c..a104b6150c 100644 --- a/legacy/ecore/src/lib/ecore/ecore_time.c +++ b/legacy/ecore/src/lib/ecore/ecore_time.c @@ -6,6 +6,8 @@ # include #endif +#include + #ifdef HAVE_SYS_TIME_H # include #endif diff --git a/legacy/ecore/src/lib/ecore/ecore_timer.c b/legacy/ecore/src/lib/ecore/ecore_timer.c index fc1bb7f6ca..b6d926e286 100644 --- a/legacy/ecore/src/lib/ecore/ecore_timer.c +++ b/legacy/ecore/src/lib/ecore/ecore_timer.c @@ -1,3 +1,14 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + #include "ecore_private.h" #include "Ecore.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_tree.c b/legacy/ecore/src/lib/ecore/ecore_tree.c index 149543f0e4..59c63a2687 100644 --- a/legacy/ecore/src/lib/ecore/ecore_tree.c +++ b/legacy/ecore/src/lib/ecore/ecore_tree.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" #include "Ecore_Data.h" diff --git a/legacy/ecore/src/lib/ecore/ecore_value.c b/legacy/ecore/src/lib/ecore/ecore_value.c index a77a996c42..4589fec8b5 100644 --- a/legacy/ecore/src/lib/ecore/ecore_value.c +++ b/legacy/ecore/src/lib/ecore/ecore_value.c @@ -24,6 +24,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + #include "Ecore.h" #include "Ecore_Data.h" #include "ecore_private.h" @@ -100,10 +111,10 @@ ecore_str_hash(const void *key) EAPI int ecore_direct_compare(const void *key1, const void *key2) { - unsigned int k1, k2; + unsigned long k1, k2; - k1 = (unsigned int) key1; - k2 = (unsigned int) key2; + k1 = (unsigned long) key1; + k2 = (unsigned long) key2; if (k1 > k2) return 1; diff --git a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h index b2b9d58091..67f61230a7 100644 --- a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h +++ b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h @@ -4,9 +4,17 @@ #ifndef _ECORE_CON_H #define _ECORE_CON_H -#ifdef EAPI -#undef EAPI +#include +#include +#ifdef HAVE_NETDB_H +# include #endif +#include + +#ifdef EAPI +# undef EAPI +#endif + #ifdef _MSC_VER # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) @@ -25,13 +33,6 @@ # endif #endif -#include -#include -#ifdef HAVE_NETDB_H -# include -#endif -#include - /** * @file Ecore_Con.h * @brief Sockets functions. diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index e4040eec31..5b83ed4738 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -2,13 +2,17 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include #include #include - -#include +#include +#include #include "Ecore.h" #include "ecore_private.h" diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_dns.c b/legacy/ecore/src/lib/ecore_con/ecore_con_dns.c index 783b5c4ba4..d8b58cbcd7 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_dns.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_dns.c @@ -1,6 +1,7 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * Simple dns lookup * @@ -26,10 +27,12 @@ * * * Need more buffer overflow checks. */ -#include "ecore_private.h" -#include "Ecore.h" -#include "ecore_con_private.h" +#ifdef HAVE_CONFIG_H +# include +#endif + +#include #include #include #include @@ -37,6 +40,10 @@ #include #include +#include "ecore_private.h" +#include "Ecore.h" +#include "ecore_con_private.h" + typedef struct _CB_Data CB_Data; struct _CB_Data diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c b/legacy/ecore/src/lib/ecore_con/ecore_con_info.c index ec4a47123f..de21a00e10 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_info.c @@ -1,16 +1,19 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * getaddrinfo with callback * * man getaddrinfo * */ -#include "ecore_private.h" -#include "Ecore.h" -#include "ecore_con_private.h" +#ifdef HAVE_CONFIG_H +# include +#endif + +#include #include #include #include @@ -18,6 +21,10 @@ #include #include +#include "ecore_private.h" +#include "Ecore.h" +#include "ecore_con_private.h" + typedef struct _CB_Data CB_Data; struct _CB_Data diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c index d450cb683a..baefc21f11 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c @@ -2,6 +2,10 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + #if USE_GNUTLS # include #elif USE_OPENSSL @@ -256,7 +260,7 @@ _ecore_con_ssl_server_shutdown_gnutls(Ecore_Con_Server *svr) * should try again later. */ static Ecore_Con_State -_ecore_con_ssl_server_try_gnutls(Ecore_Con_Server *svr) +_ecore_con_ssl_server_try_gnutls(Ecore_Con_Server *svr __UNUSED__) { return ECORE_CON_CONNECTED; } diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c index 783d9304b4..9461aa6313 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c @@ -43,15 +43,21 @@ * * FIXME: Support more CURL features: Authentication, Progress callbacks and more... */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include +#include + #include "Ecore.h" #include "ecore_private.h" #include "Ecore_Con.h" #include "ecore_con_private.h" -#include -#include -#include - /** * @defgroup Ecore_Con_Url_Group Ecore URL Connection Functions * @@ -827,7 +833,7 @@ _ecore_con_url_perform(Ecore_Con_Url *url_con) } static int -_ecore_con_url_idler_handler(void *data) +_ecore_con_url_idler_handler(void *data __UNUSED__) { double start; int done = 1; diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c index 98039d7a21..0966d86546 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -11,7 +19,6 @@ #include #include "Ecore_Config.h" -#include "config.h" #include "ecore_config_private.h" #include "ecore_config_ipc.h" diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_db.c b/legacy/ecore/src/lib/ecore_config/ecore_config_db.c index 712ebbb47c..ecd19e1c33 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_db.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_db.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -9,10 +17,11 @@ #include #include +#include + #include "Ecore_Config.h" #include "ecore_config_private.h" #include "ecore_config_util.h" -#include struct _Ecore_Config_DB_File { diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c index 79813630d4..9aba4350ba 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -8,8 +16,6 @@ #include "Ecore_Config.h" #include "Ecore.h" -#include "config.h" - typedef struct __Ecore_Config_Arg_Callback _Ecore_Config_Arg_Callback; struct __Ecore_Config_Arg_Callback { diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c index 44fa9d0b32..b528584db6 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + /* by Azundris, with thanks to Corey Donohoe */ #include #include @@ -18,7 +26,6 @@ #include "ecore_config_private.h" #include "Ecore_Config.h" -#include "config.h" /*****************************************************************************/ diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c index 5d6a18a077..7478559b67 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + /* ############## bad */ #define HAVE_EVAS2 @@ -15,7 +23,6 @@ #include "ecore_config_util.h" #include "ecore_config_ipc.h" -#include "config.h" #include "ecore_config_private.h" static Ecore_Config_Server *__ecore_config_servers; diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c index 104dd18945..87cb59be3a 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_util.c b/legacy/ecore/src/lib/ecore_config/ecore_config_util.c index 6ee17c3725..c53ba1ca8a 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_util.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_util.c @@ -1,7 +1,16 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + /* azundris */ #include #include /* malloc(), free() */ +#include #include /* str...() */ #include /* varargs in sprintf/appendf */ diff --git a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h index 7f9e8982ef..def50e1b99 100644 --- a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h +++ b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h @@ -1,6 +1,9 @@ #ifndef _ECORE_DIRECTFB_H #define _ECORE_DIRECTFB_H +#include +#include + #ifdef EAPI #undef EAPI #endif @@ -22,9 +25,6 @@ # endif #endif -#include -#include - #ifdef __cplusplus extern "C" { diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c index 398200caae..7f7f6282af 100644 --- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c +++ b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c @@ -1,3 +1,14 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + #include "ecore_private.h" #include "Ecore_DirectFB.h" #include "ecore_directfb_private.h" @@ -643,7 +654,7 @@ ecore_directfb_window_size_get(Ecore_DirectFB_Window *ecore_window, int *w, int } EAPI int -ecore_directfb_init(const char *name) +ecore_directfb_init(const char *name __UNUSED__) { int i = 0; @@ -695,8 +706,6 @@ ecore_directfb_init(const char *name) EAPI int ecore_directfb_shutdown(void) { - int i; - _ecore_directfb_init_count--; if (_ecore_directfb_init_count > 0) return _ecore_directfb_init_count; if (_ecore_directfb_init_count < 0) diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c index 8aa28b4b84..c4df7df69a 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c @@ -1,13 +1,17 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #ifdef HAVE_CONFIG_H # include #endif +#include + #include "Ecore.h" #include "ecore_private.h" #include "ecore_evas_private.h" #include "Ecore_Evas.h" -#include static int _ecore_evas_init_count = 0; static Ecore_Fd_Handler *_ecore_evas_async_events_fd = NULL; diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c index 16ba4f489d..9c779573b2 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c @@ -1,4 +1,13 @@ -#include "config.h" +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + #include "Ecore.h" #include "ecore_private.h" #include "ecore_evas_private.h" diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c index 89d9391e48..e0515e58b7 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c @@ -1,7 +1,14 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "config.h" + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + #include "Ecore.h" #include "ecore_private.h" #include "ecore_evas_private.h" diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c index 2a054713e7..54b9aea6ff 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c @@ -1,4 +1,11 @@ -#include "config.h" +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #ifdef BUILD_ECORE_EVAS_QUARTZ #import #endif diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c index 2274024871..b17643ffe6 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c @@ -1,4 +1,11 @@ -#include "config.h" +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "Ecore.h" #include "ecore_private.h" #include "ecore_evas_private.h" diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c index 626193e023..67c24fcedc 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c @@ -1,7 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifdef HAVE_CONFIG_H # include #endif +#include + #include "Ecore.h" #include "ecore_private.h" #include "ecore_evas_private.h" diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c index 2f8a94adc4..a712859c13 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c @@ -6,6 +6,8 @@ # include "config.h" #endif +#include + #include "Ecore.h" #include "ecore_private.h" #ifdef BUILD_ECORE_EVAS_X11 diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb.c index a695dda15a..83b36b5658 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore_Fb.h" #include "ecore_fb_private.h" diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c index cc1d591c5f..bc0e11f009 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore_Fb.h" #include "ecore_fb_private.h" diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h b/legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h index 2d098095e0..6b5628196e 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h @@ -6,6 +6,7 @@ #include "Ecore_Data.h" #include +#include #include #include #include diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c index 6265becb24..895f9a3101 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c @@ -1,10 +1,18 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifdef HAVE_TSLIB +# include +# include +#endif + #include "Ecore_Fb.h" #include "ecore_fb_private.h" -#include "config.h" -#ifdef HAVE_TSLIB -#include -#include -#endif typedef struct _Ecore_Fb_Ts_Event Ecore_Fb_Ts_Event; typedef struct _Ecore_Fb_Ts_Calibrate Ecore_Fb_Ts_Calibrate; diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c index 9831ef3e3c..972aa9ba84 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore_Fb.h" #include "ecore_fb_private.h" diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/legacy/ecore/src/lib/ecore_file/ecore_file.c index 9112a8affb..eb3f4f0982 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file.c @@ -6,6 +6,13 @@ # include #endif +#include +#include +#include +#include +#include +#include + #ifndef _FILE_OFFSET_BITS # define _FILE_OFFSET_BITS 64 #endif diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c index e0472f0820..4506f72f7f 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c @@ -6,6 +6,9 @@ # include #endif +#include +#include + #include "Ecore_Con.h" #include "ecore_file_private.h" diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c index 513ee2c158..a505ef3b81 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c @@ -6,6 +6,9 @@ # include #endif +#include +#include + #include "ecore_file_private.h" /* diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c index abbdd22f51..6573539dc1 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c @@ -6,6 +6,9 @@ # include #endif +#include +#include + #include "ecore_file_private.h" #ifdef HAVE_POLL diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c b/legacy/ecore/src/lib/ecore_file/ecore_file_path.c index 7100d95e49..de2b4dc4d4 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_path.c @@ -6,6 +6,9 @@ # include #endif +#include +#include + #include "ecore_file_private.h" static int init = 0; diff --git a/legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h b/legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h index d8398199d1..71f890f27c 100644 --- a/legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h +++ b/legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h @@ -5,6 +5,8 @@ #ifndef _ECORE_IMF_H #define _ECORE_IMF_H +#include + #ifdef EAPI # undef EAPI #endif @@ -31,8 +33,6 @@ # endif #endif /* ! _WIN32 */ -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c index caf967142a..5290d37295 100644 --- a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c +++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c @@ -2,13 +2,15 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include +#endif + +#include #include "Ecore_IMF.h" #include "ecore_imf_private.h" -#include - EAPI int ECORE_IMF_EVENT_PREEDIT_START = 0; EAPI int ECORE_IMF_EVENT_PREEDIT_END = 0; EAPI int ECORE_IMF_EVENT_PREEDIT_CHANGED = 0; diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c index 83f1fd4d0a..827b794ec1 100644 --- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c +++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c @@ -2,16 +2,19 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include -#include +#ifdef HAVE_CONFIG_H +# include +#endif -#include "config.h" +#include +#include +#include + +#include #include "Ecore_IMF.h" #include "ecore_imf_private.h" -#include - /** * @defgroup Ecore_IMF_Context_Group Ecore Input Method Context Functions * diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c index 78def12667..78de2dc98e 100644 --- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c +++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c @@ -2,11 +2,14 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include - -#include "config.h" +#include +#include #include "ecore_imf_private.h" diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h index 59130dbf84..8e07366880 100644 --- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h +++ b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h @@ -1,9 +1,12 @@ #ifndef _ECORE_IPC_H #define _ECORE_IPC_H +#include + #ifdef EAPI -#undef EAPI +# undef EAPI #endif + #ifdef _MSC_VER # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) @@ -22,8 +25,6 @@ # endif #endif -#include - /** * @file Ecore_Ipc.h * @brief Ecore inter-process communication functions. diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c index 1ea788787a..529c75f0d2 100644 --- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c +++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c @@ -1,5 +1,12 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "Ecore.h" -#include #include "Ecore_Con.h" #include "ecore_private.h" #include "ecore_ipc_private.h" @@ -8,6 +15,7 @@ #ifdef HAVE_NETINET_IN_H # include #endif + #ifdef HAVE_WINSOCK2_H # include #endif diff --git a/legacy/ecore/src/lib/ecore_job/ecore_job.c b/legacy/ecore/src/lib/ecore_job/ecore_job.c index 44ac1e08cf..dce9132105 100644 --- a/legacy/ecore/src/lib/ecore_job/ecore_job.c +++ b/legacy/ecore/src/lib/ecore_job/ecore_job.c @@ -1,8 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #ifdef HAVE_CONFIG_H # include #endif +#include + #include "Ecore.h" #include "ecore_private.h" #include "ecore_job_private.h" diff --git a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c b/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c index 2d9d3168a2..3187c3d952 100644 --- a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c +++ b/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include "Ecore_Sdl.h" diff --git a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c b/legacy/ecore/src/lib/ecore_txt/ecore_txt.c index 8f605ab2e4..29608af9b1 100644 --- a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c +++ b/legacy/ecore/src/lib/ecore_txt/ecore_txt.c @@ -1,14 +1,15 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #ifdef HAVE_CONFIG_H # include #endif -#include -#include #include -#include -#include #include +#include +#include #include "Ecore_Txt.h" #include "ecore_txt_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c index bb9751ee0f..ab4c58eab3 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c @@ -1,6 +1,13 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" #include "ecore_x_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c index cdd22bbf9c..845368f8a1 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c @@ -2,7 +2,27 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "config.h" +#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 "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c index 486d042c96..31dc99aa2d 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c @@ -2,6 +2,11 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c index d420a482e5..797b0b821d 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_x_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c index 3507ce25cd..d8ce1e1e0b 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c @@ -2,6 +2,11 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c index b84a443340..c2f0659116 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c @@ -1,6 +1,14 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c index d4dac43deb..b7583bc06c 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c @@ -2,6 +2,10 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include "ecore_x_private.h" static int _dpms_available; diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c index efc1c9c02e..1da84de654 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c @@ -2,6 +2,10 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include "ecore_x_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c index 152ce36e50..c6242c7b0a 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c @@ -1,9 +1,15 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * OLD E hints */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "config.h" #include "Ecore.h" #include "ecore_x_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c index 3de31d6015..5b288963ad 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" #include "ecore_x_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c index 95350f48eb..a27b778bd9 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c @@ -1,6 +1,13 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include #include "ecore_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c index d4645a7400..4aeeb61398 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c @@ -2,6 +2,12 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c index 56224f095c..721522df2b 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c index 399ca92d19..4a9d3d661a 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c @@ -1,12 +1,20 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * Various ICCCM related functions. - * + * * This is ALL the code involving anything ICCCM related. for both WM and * client. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c index c009c7a038..d4211286db 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c @@ -1,9 +1,20 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + /* * Various MWM related functions. - * + * * This is ALL the code involving anything MWM related. for both WM and * client. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c index 7cf07e5e1a..b9ed043938 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c @@ -1,9 +1,15 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * _NET_WM... aka Extended Window Manager Hint (EWMH) functions. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "config.h" #include "Ecore.h" #include "Ecore_Data.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c index 99112005b9..4883a3aa87 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c @@ -1,3 +1,11 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h index 4d03466bb3..e2f99709b7 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h @@ -1,8 +1,6 @@ #ifndef _ECORE_X_PRIVATE_H #define _ECORE_X_PRIVATE_H -#include "config.h" - #include #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c index 350995729d..4fc211e855 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c @@ -2,6 +2,12 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_x_private.h" EAPI int diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c index 6559cad0f3..9b769fd249 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c @@ -1,9 +1,15 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * Screensaver code */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c index de45c23dbb..b224fc7fb2 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c @@ -1,6 +1,13 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "ecore_private.h" #include "Ecore.h" #include "ecore_x_private.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c index feaaa272d3..e66fb15ed8 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c @@ -1,9 +1,15 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * XSync code */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_test.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_test.c index 427d23c430..55469e5a8b 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_test.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_test.c @@ -2,6 +2,16 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#ifdef ECORE_XTEST +# include +#endif + #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c index 517fcac706..61fadb6b0a 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c @@ -1,6 +1,13 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c index 60816800fd..2d25ce5475 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c @@ -1,6 +1,13 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c index 2e30587e3d..ca927260d3 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c @@ -1,3 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h" diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c index 4c7353d4a9..5be0b16f89 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c @@ -1,9 +1,15 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + /* * Xinerama code */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "Ecore.h" #include "ecore_x_private.h" #include "Ecore_X.h"