cedric pushed a commit to branch master.
commit 409cd8723d666de72ddcefdb68ef678b54891286
Author: Cedric Bail <[email protected]>
Date: Mon Jul 22 20:25:10 2013 +0900
elementary: fix header inclusion order.
---
src/bin/config.c | 2 +-
src/bin/elementary_codegen.c | 4 ++--
src/bin/quicklaunch.c | 3 ++-
src/bin/test_main_menu.c | 2 +-
src/edje_externals/elm.c | 4 ++++
src/lib/elm_gesture_layer_extra_gestures.c | 4 ++++
src/modules/access_output/mod.c | 3 ++-
src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c | 5 +++--
src/modules/prefs/prefs_iface.c | 4 ++++
src/modules/test_entry/mod.c | 3 ++-
src/modules/test_map/mod.c | 5 +++--
11 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 60ae145..b9c8100 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
+#include <Elementary.h>
#ifndef ELM_LIB_QUICKLAUNCH
typedef struct _Theme Theme;
diff --git a/src/bin/elementary_codegen.c b/src/bin/elementary_codegen.c
index b12c79e..4f27058 100644
--- a/src/bin/elementary_codegen.c
+++ b/src/bin/elementary_codegen.c
@@ -1,5 +1,3 @@
-#include <Elementary.h>
-
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
@@ -12,6 +10,8 @@
#include <Edje_Edit.h>
#include <Eina.h>
+#include <Elementary.h>
+
#include <ctype.h>
#include <fcntl.h>
#include <locale.h>
diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index 3913a74..4caad3b 100644
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
@@ -18,6 +17,8 @@
#include <signal.h>
#include <sys/wait.h>
+#include <Elementary.h>
+
#ifdef HAVE_ENVIRON
extern char **environ;
#endif
diff --git a/src/bin/test_main_menu.c b/src/bin/test_main_menu.c
index f031fd7..e7a527d 100644
--- a/src/bin/test_main_menu.c
+++ b/src/bin/test_main_menu.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
+#include <Elementary.h>
#ifndef ELM_LIB_QUICKLAUNCH
static void
diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c
index 4233228..9a316fb 100644
--- a/src/edje_externals/elm.c
+++ b/src/edje_externals/elm.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
#include "Elementary.h"
#include "private.h"
diff --git a/src/lib/elm_gesture_layer_extra_gestures.c
b/src/lib/elm_gesture_layer_extra_gestures.c
index 97468a3..fec7f8f 100644
--- a/src/lib/elm_gesture_layer_extra_gestures.c
+++ b/src/lib/elm_gesture_layer_extra_gestures.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
#include <Eina.h>
#include <Elementary.h>
diff --git a/src/modules/access_output/mod.c b/src/modules/access_output/mod.c
index 91e5bb2..4a9816e 100644
--- a/src/modules/access_output/mod.c
+++ b/src/modules/access_output/mod.c
@@ -1,8 +1,9 @@
-#include <Elementary.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
+#include <Elementary.h>
+
/* to enable this module
export ELM_MODULES="access_output>access/api"
export ELM_ACCESS_MODE=1
diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 5773b26..d5595ed 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -1,9 +1,10 @@
-#include <Elementary.h>
-#include "elm_priv.h"
#ifdef HAVE_CONFIG_H
#include "elementary_config.h"
#endif
+#include <Elementary.h>
+#include "elm_priv.h"
+
#define DATETIME_FIELD_COUNT 6
#define FIELD_FORMAT_LEN 3
#define DISKSELECTOR_MIN_ITEMS 4
diff --git a/src/modules/prefs/prefs_iface.c b/src/modules/prefs/prefs_iface.c
index f3ec071..5d1b12b 100644
--- a/src/modules/prefs/prefs_iface.c
+++ b/src/modules/prefs/prefs_iface.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
#include "Elementary.h"
#include "private.h"
diff --git a/src/modules/test_entry/mod.c b/src/modules/test_entry/mod.c
index 0b978e6..c3620b2 100644
--- a/src/modules/test_entry/mod.c
+++ b/src/modules/test_entry/mod.c
@@ -1,8 +1,9 @@
-#include <Elementary.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
+#include <Elementary.h>
+
// module api funcs needed
EAPI int
elm_modapi_init(void *m __UNUSED__)
diff --git a/src/modules/test_map/mod.c b/src/modules/test_map/mod.c
index a075cdd..4bbdcea 100644
--- a/src/modules/test_map/mod.c
+++ b/src/modules/test_map/mod.c
@@ -1,9 +1,10 @@
-#include "Elementary.h"
-#include <Eina.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
+#include "Elementary.h"
+#include <Eina.h>
+
EAPI char *
map_module_source_name_get(void)
{
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
