summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-05-18 18:07:31 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-25 16:03:31 +0200
commitc0c5bc71c5960408ceac135eb8fc250683d55ffd (patch)
tree1185ee9504f1e25bbdcf619d2b095c5c2e3fe339
parent4b5abd151c9308ad1063a84b70c4b16b3ce04839 (diff)
libs: headers: ensure we include headers in the correct order for EAPI
We need to ensure this order to make sure EAPI is working correctly on windows. Original patch by Vincent Torri. Differential Revision: https://phab.enlightenment.org/D11856 Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>
-rw-r--r--src/lib/ecore_input_evas/ecore_input_evas.c4
-rw-r--r--src/lib/elementary/Efl_Ui.h7
-rw-r--r--src/lib/elua/Elua.h16
-rw-r--r--src/lib/elua/cache.c4
-rw-r--r--src/lib/elua/io.c4
-rw-r--r--src/lib/embryo/embryo_main.c2
-rw-r--r--src/lib/embryo/embryo_private.h2
-rw-r--r--src/lib/embryo/embryo_str.c2
8 files changed, 18 insertions, 23 deletions
diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c
index 8f26737778..ea07300e7a 100644
--- a/src/lib/ecore_input_evas/ecore_input_evas.c
+++ b/src/lib/ecore_input_evas/ecore_input_evas.c
@@ -7,8 +7,8 @@
7#include <string.h> 7#include <string.h>
8#include <stdlib.h> 8#include <stdlib.h>
9 9
10#include "Ecore.h" 10#include <Ecore.h>
11#include "Ecore_Input.h" 11#include <Ecore_Input.h>
12 12
13#include "Ecore_Input_Evas.h" 13#include "Ecore_Input_Evas.h"
14#include "ecore_input_evas_private.h" 14#include "ecore_input_evas_private.h"
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index ffc5fd43c5..e2d0cf6abe 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -40,13 +40,6 @@
40#include <alloca.h> 40#include <alloca.h>
41#endif 41#endif
42 42
43#ifdef ELM_WIN32
44#include <malloc.h>
45#ifndef alloca
46#define alloca _alloca
47#endif
48#endif
49
50#ifdef _WIN32 43#ifdef _WIN32
51# define WIN32_LEAN_AND_MEAN 44# define WIN32_LEAN_AND_MEAN
52# include <winsock2.h> 45# include <winsock2.h>
diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h
index 289f9112d7..cf93d65e53 100644
--- a/src/lib/elua/Elua.h
+++ b/src/lib/elua/Elua.h
@@ -18,6 +18,14 @@
18#ifndef _ELUA_H 18#ifndef _ELUA_H
19#define _ELUA_H 19#define _ELUA_H
20 20
21#ifdef EFL_BETA_API_SUPPORT
22
23#include <Eina.h>
24
25#include <lua.h>
26#include <lualib.h>
27#include <lauxlib.h>
28
21#ifdef EAPI 29#ifdef EAPI
22# undef EAPI 30# undef EAPI
23#endif 31#endif
@@ -92,14 +100,6 @@ extern "C" {
92 * @{ 100 * @{
93 */ 101 */
94 102
95#ifdef EFL_BETA_API_SUPPORT
96
97#include <Eina.h>
98
99#include <lua.h>
100#include <lualib.h>
101#include <lauxlib.h>
102
103/** Opaque Elua state 103/** Opaque Elua state
104 * 104 *
105 * @ingroup Elua 105 * @ingroup Elua
diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c
index b18d690569..c731b0495a 100644
--- a/src/lib/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -1,10 +1,10 @@
1#include "elua_private.h"
2
3#include <sys/types.h> 1#include <sys/types.h>
4#include <sys/stat.h> 2#include <sys/stat.h>
5#include <fcntl.h> 3#include <fcntl.h>
6#include <unistd.h> 4#include <unistd.h>
7 5
6#include "elua_private.h"
7
8/* bytecode caching */ 8/* bytecode caching */
9 9
10static Eina_File * 10static Eina_File *
diff --git a/src/lib/elua/io.c b/src/lib/elua/io.c
index 77ac3df94c..142f61b716 100644
--- a/src/lib/elua/io.c
+++ b/src/lib/elua/io.c
@@ -1,9 +1,9 @@
1#include "elua_private.h"
2
3#ifdef _WIN32 1#ifdef _WIN32
4# include <evil_private.h> /* realpath */ 2# include <evil_private.h> /* realpath */
5#endif 3#endif
6 4
5#include "elua_private.h"
6
7/* expand fname to full path name (so that PATH is ignored) plus turn 7/* expand fname to full path name (so that PATH is ignored) plus turn
8 * stuff into a command, and also verify whether the path exists */ 8 * stuff into a command, and also verify whether the path exists */
9static char * 9static char *
diff --git a/src/lib/embryo/embryo_main.c b/src/lib/embryo/embryo_main.c
index 852b1903f2..452a272787 100644
--- a/src/lib/embryo/embryo_main.c
+++ b/src/lib/embryo/embryo_main.c
@@ -6,6 +6,8 @@
6#include <stdlib.h> 6#include <stdlib.h>
7#include <time.h> 7#include <time.h>
8 8
9#include <Eina.h>
10
9#include "Embryo.h" 11#include "Embryo.h"
10#include "embryo_private.h" 12#include "embryo_private.h"
11 13
diff --git a/src/lib/embryo/embryo_private.h b/src/lib/embryo/embryo_private.h
index 4bf8ceb2c6..e63351b2c7 100644
--- a/src/lib/embryo/embryo_private.h
+++ b/src/lib/embryo/embryo_private.h
@@ -1,8 +1,6 @@
1#ifndef _EMBRYO_PRIVATE_H 1#ifndef _EMBRYO_PRIVATE_H
2#define _EMBRYO_PRIVATE_H 2#define _EMBRYO_PRIVATE_H
3 3
4#include <Eina.h>
5
6typedef enum _Embryo_Opcode Embryo_Opcode; 4typedef enum _Embryo_Opcode Embryo_Opcode;
7 5
8enum _Embryo_Opcode 6enum _Embryo_Opcode
diff --git a/src/lib/embryo/embryo_str.c b/src/lib/embryo/embryo_str.c
index d7da4e0dd3..6fafa83db0 100644
--- a/src/lib/embryo/embryo_str.c
+++ b/src/lib/embryo/embryo_str.c
@@ -16,6 +16,8 @@
16#include <string.h> 16#include <string.h>
17#include <fnmatch.h> 17#include <fnmatch.h>
18 18
19#include <Eina.h>
20
19#include "Embryo.h" 21#include "Embryo.h"
20#include "embryo_private.h" 22#include "embryo_private.h"
21 23