summaryrefslogtreecommitdiff
path: root/legacy/ecore
diff options
context:
space:
mode:
authorsebastid <sebastid>2005-09-05 10:17:08 +0000
committersebastid <sebastid@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2005-09-05 10:17:08 +0000
commitd758ca86bba6892f734b8b44c2ebd36034e20a9c (patch)
treeabbe8c97296a8a855e8947a1536ab6574f2dd4cf /legacy/ecore
parent150b139bdf9a0f9ed6355cb666fce9d41a8e1adf (diff)
Header cleanup. Don't include unneeded headers in system lib header.
SVN revision: 16550
Diffstat (limited to 'legacy/ecore')
-rw-r--r--legacy/ecore/examples/args_example.c3
-rw-r--r--legacy/ecore/examples/event_handler_example.c3
-rw-r--r--legacy/ecore/examples/timer_example.c3
-rw-r--r--legacy/ecore/src/bin/ecore_config.c4
-rw-r--r--legacy/ecore/src/bin/ecore_evas_test.h3
-rw-r--r--legacy/ecore/src/bin/ecore_test.c5
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore.h39
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_hash.c3
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_list.c2
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_path.c3
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_plugin.c3
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_private.h31
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_sheap.c3
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_strings.c3
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_tree.c3
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_value.c2
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con_private.h2
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h2
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h2
-rw-r--r--legacy/ecore/src/lib/ecore_x/ecore_x_private.h1
20 files changed, 73 insertions, 47 deletions
diff --git a/legacy/ecore/examples/args_example.c b/legacy/ecore/examples/args_example.c
index 439b09c0b6..d8a8a5e84b 100644
--- a/legacy/ecore/examples/args_example.c
+++ b/legacy/ecore/examples/args_example.c
@@ -1,6 +1,9 @@
1/* Example of how to set and retrieve program arguments. 1/* Example of how to set and retrieve program arguments.
2 */ 2 */
3#include <Ecore.h> 3#include <Ecore.h>
4
5#include <stdlib.h>
6#include <stdio.h>
4 7
5int timer_once(void *data) 8int timer_once(void *data)
6{ 9{
diff --git a/legacy/ecore/examples/event_handler_example.c b/legacy/ecore/examples/event_handler_example.c
index 6e0f1f7e3a..09bc3e7697 100644
--- a/legacy/ecore/examples/event_handler_example.c
+++ b/legacy/ecore/examples/event_handler_example.c
@@ -1,5 +1,8 @@
1/* Ecore Event Handler Example. */ 1/* Ecore Event Handler Example. */
2#include <Ecore.h> 2#include <Ecore.h>
3
4#include <stdlib.h>
5#include <stdio.h>
3 6
4Ecore_Event_Handler *handler1 = NULL, *handler2 = NULL; 7Ecore_Event_Handler *handler1 = NULL, *handler2 = NULL;
5 8
diff --git a/legacy/ecore/examples/timer_example.c b/legacy/ecore/examples/timer_example.c
index d04dba22e5..d50d13095c 100644
--- a/legacy/ecore/examples/timer_example.c
+++ b/legacy/ecore/examples/timer_example.c
@@ -2,6 +2,9 @@
2 */ 2 */
3 3
4#include <Ecore.h> 4#include <Ecore.h>
5
6#include <stdlib.h>
7#include <stdio.h>
5 8
6Ecore_Timer *timer1 = NULL; 9Ecore_Timer *timer1 = NULL;
7Ecore_Timer *timer2 = NULL; 10Ecore_Timer *timer2 = NULL;
diff --git a/legacy/ecore/src/bin/ecore_config.c b/legacy/ecore/src/bin/ecore_config.c
index 690d9fdd22..8474d4098e 100644
--- a/legacy/ecore/src/bin/ecore_config.c
+++ b/legacy/ecore/src/bin/ecore_config.c
@@ -1,6 +1,10 @@
1#include "config.h" 1#include "config.h"
2#include "Ecore.h" 2#include "Ecore.h"
3 3
4#include <stdio.h>
5#include <string.h>
6#include <stdlib.h>
7
4#ifdef BUILD_ECORE_CONFIG 8#ifdef BUILD_ECORE_CONFIG
5#include "Ecore_Config.h" 9#include "Ecore_Config.h"
6 10
diff --git a/legacy/ecore/src/bin/ecore_evas_test.h b/legacy/ecore/src/bin/ecore_evas_test.h
index f0b996278d..1b8c845160 100644
--- a/legacy/ecore/src/bin/ecore_evas_test.h
+++ b/legacy/ecore/src/bin/ecore_evas_test.h
@@ -4,6 +4,9 @@
4#include "config.h" 4#include "config.h"
5#include "Ecore.h" 5#include "Ecore.h"
6#include <math.h> 6#include <math.h>
7#include <stdlib.h>
8#include <stdio.h>
9#include <string.h>
7 10
8#ifdef BUILD_ECORE_EVAS 11#ifdef BUILD_ECORE_EVAS
9#include "Ecore_Evas.h" 12#include "Ecore_Evas.h"
diff --git a/legacy/ecore/src/bin/ecore_test.c b/legacy/ecore/src/bin/ecore_test.c
index c32aef8c11..0bbad252da 100644
--- a/legacy/ecore/src/bin/ecore_test.c
+++ b/legacy/ecore/src/bin/ecore_test.c
@@ -20,6 +20,11 @@
20#endif 20#endif
21 21
22#include <math.h> 22#include <math.h>
23#include <stdlib.h>
24#include <stdio.h>
25#include <string.h>
26#include <sys/types.h>
27#include <unistd.h>
23 28
24/* APP GLOBALS */ 29/* APP GLOBALS */
25double start_time = 0; 30double start_time = 0;
diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h
index 308262d677..9c58b13f14 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/legacy/ecore/src/lib/ecore/Ecore.h
@@ -41,51 +41,12 @@
41 */ 41 */
42 42
43#include <sys/types.h> 43#include <sys/types.h>
44#include <unistd.h>
45#include <stdio.h>
46#include <stdlib.h>
47#include <string.h>
48#include <math.h>
49#include <sys/types.h>
50#include <sys/stat.h>
51#include <dirent.h>
52#include <limits.h>
53#include <signal.h> 44#include <signal.h>
54 45
55#include <Ecore_Data.h>
56
57#ifdef __cplusplus 46#ifdef __cplusplus
58extern "C" { 47extern "C" {
59#endif 48#endif
60 49
61#ifndef TRUE
62#define TRUE 1
63#endif
64
65#ifndef FALSE
66#define FALSE 0
67#endif
68
69#ifndef PATH_MAX
70#define PATH_MAX 4096
71#endif
72
73#ifndef MIN
74#define MIN(x, y) (((x) > (y)) ? (y) : (x))
75#endif
76
77#ifndef MAX
78#define MAX(x, y) (((x) > (y)) ? (x) : (y))
79#endif
80
81#ifndef ABS
82#define ABS(x) ((x) < 0 ? -(x) : (x))
83#endif
84
85#ifndef CLAMP
86#define CLAMP(x, min, max) (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x)))
87#endif
88
89#define ECORE_EVENT_NONE 0 50#define ECORE_EVENT_NONE 0
90#define ECORE_EVENT_EXE_EXIT 1 /**< Spawned Exe has exit event */ 51#define ECORE_EVENT_EXE_EXIT 1 /**< Spawned Exe has exit event */
91#define ECORE_EVENT_SIGNAL_USER 2 /**< User signal event */ 52#define ECORE_EVENT_SIGNAL_USER 2 /**< User signal event */
diff --git a/legacy/ecore/src/lib/ecore/ecore_hash.c b/legacy/ecore/src/lib/ecore/ecore_hash.c
index 0802a2221e..a96c22f0d2 100644
--- a/legacy/ecore/src/lib/ecore/ecore_hash.c
+++ b/legacy/ecore/src/lib/ecore/ecore_hash.c
@@ -1,4 +1,5 @@
1#include <Ecore.h> 1#include "ecore_private.h"
2#include "Ecore_Data.h"
2 3
3#define ECORE_HASH_CHAIN_MAX 3 4#define ECORE_HASH_CHAIN_MAX 3
4 5
diff --git a/legacy/ecore/src/lib/ecore/ecore_list.c b/legacy/ecore/src/lib/ecore/ecore_list.c
index deeadab312..9f0deeab1e 100644
--- a/legacy/ecore/src/lib/ecore/ecore_list.c
+++ b/legacy/ecore/src/lib/ecore/ecore_list.c
@@ -1,5 +1,5 @@
1#include "ecore_private.h" 1#include "ecore_private.h"
2#include "Ecore.h" 2#include "Ecore_Data.h"
3 3
4/* Return information about the list */ 4/* Return information about the list */
5static void *_ecore_list_current(Ecore_List * list); 5static void *_ecore_list_current(Ecore_List * list);
diff --git a/legacy/ecore/src/lib/ecore/ecore_path.c b/legacy/ecore/src/lib/ecore/ecore_path.c
index 9202eea8d0..78b04387b2 100644
--- a/legacy/ecore/src/lib/ecore/ecore_path.c
+++ b/legacy/ecore/src/lib/ecore/ecore_path.c
@@ -1,4 +1,5 @@
1#include <Ecore.h> 1#include "ecore_private.h"
2#include "Ecore_Data.h"
2 3
3static Ecore_List *group_list = NULL; 4static Ecore_List *group_list = NULL;
4 5
diff --git a/legacy/ecore/src/lib/ecore/ecore_plugin.c b/legacy/ecore/src/lib/ecore/ecore_plugin.c
index 42d62035d2..37442c0208 100644
--- a/legacy/ecore/src/lib/ecore/ecore_plugin.c
+++ b/legacy/ecore/src/lib/ecore/ecore_plugin.c
@@ -1,4 +1,5 @@
1#include <Ecore.h> 1#include "ecore_private.h"
2#include "Ecore_Data.h"
2 3
3#ifndef WIN32 4#ifndef WIN32
4#include <dlfcn.h> 5#include <dlfcn.h>
diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h
index ef308dc5b7..7228cc8367 100644
--- a/legacy/ecore/src/lib/ecore/ecore_private.h
+++ b/legacy/ecore/src/lib/ecore/ecore_private.h
@@ -3,12 +3,15 @@
3 3
4#include <stdio.h> 4#include <stdio.h>
5#include <stdlib.h> 5#include <stdlib.h>
6#include <string.h>
6#include <sys/time.h> 7#include <sys/time.h>
7#include <sys/types.h> 8#include <sys/types.h>
8#include <unistd.h> 9#include <unistd.h>
9#include <signal.h> 10#include <signal.h>
10#include <sys/stat.h> 11#include <sys/stat.h>
11#include <fcntl.h> 12#include <fcntl.h>
13#include <limits.h>
14#include <dirent.h>
12 15
13#ifndef WIN32 16#ifndef WIN32
14#include <sys/mman.h> 17#include <sys/mman.h>
@@ -24,6 +27,34 @@
24#define __UNUSED__ 27#define __UNUSED__
25#endif 28#endif
26 29
30#ifndef TRUE
31#define TRUE 1
32#endif
33
34#ifndef FALSE
35#define FALSE 0
36#endif
37
38#ifndef PATH_MAX
39#define PATH_MAX 4096
40#endif
41
42#ifndef MIN
43#define MIN(x, y) (((x) > (y)) ? (y) : (x))
44#endif
45
46#ifndef MAX
47#define MAX(x, y) (((x) > (y)) ? (x) : (y))
48#endif
49
50#ifndef ABS
51#define ABS(x) ((x) < 0 ? -(x) : (x))
52#endif
53
54#ifndef CLAMP
55#define CLAMP(x, min, max) (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x)))
56#endif
57
27#define ECORE_MAGIC_NONE 0x1234fedc 58#define ECORE_MAGIC_NONE 0x1234fedc
28#define ECORE_MAGIC_EXE 0xf7e812f5 59#define ECORE_MAGIC_EXE 0xf7e812f5
29#define ECORE_MAGIC_TIMER 0xf7d713f4 60#define ECORE_MAGIC_TIMER 0xf7d713f4
diff --git a/legacy/ecore/src/lib/ecore/ecore_sheap.c b/legacy/ecore/src/lib/ecore/ecore_sheap.c
index b63060881b..969845d7b1 100644
--- a/legacy/ecore/src/lib/ecore/ecore_sheap.c
+++ b/legacy/ecore/src/lib/ecore/ecore_sheap.c
@@ -1,4 +1,5 @@
1#include <Ecore.h> 1#include "ecore_private.h"
2#include "Ecore_Data.h"
2 3
3static void _ecore_sheap_heapify(Ecore_Sheap *heap, int i); 4static void _ecore_sheap_heapify(Ecore_Sheap *heap, int i);
4static void _ecore_sheap_update_data(Ecore_Sheap *heap); 5static void _ecore_sheap_update_data(Ecore_Sheap *heap);
diff --git a/legacy/ecore/src/lib/ecore/ecore_strings.c b/legacy/ecore/src/lib/ecore/ecore_strings.c
index 032d2a5d81..f1eddffea7 100644
--- a/legacy/ecore/src/lib/ecore/ecore_strings.c
+++ b/legacy/ecore/src/lib/ecore/ecore_strings.c
@@ -1,4 +1,5 @@
1#include <Ecore.h> 1#include "ecore_private.h"
2#include "Ecore_Data.h"
2 3
3static Ecore_Hash *ecore_strings = NULL; 4static Ecore_Hash *ecore_strings = NULL;
4 5
diff --git a/legacy/ecore/src/lib/ecore/ecore_tree.c b/legacy/ecore/src/lib/ecore/ecore_tree.c
index 55322dd675..ed7e146383 100644
--- a/legacy/ecore/src/lib/ecore/ecore_tree.c
+++ b/legacy/ecore/src/lib/ecore/ecore_tree.c
@@ -1,4 +1,5 @@
1#include <Ecore.h> 1#include "ecore_private.h"
2#include "Ecore_Data.h"
2 3
3/* A macro for determining the highest node at given branch */ 4/* A macro for determining the highest node at given branch */
4#define MAX_HEIGHT(node) (node ? MAX(node->max_left, node->max_right) : 0) 5#define MAX_HEIGHT(node) (node ? MAX(node->max_left, node->max_right) : 0)
diff --git a/legacy/ecore/src/lib/ecore/ecore_value.c b/legacy/ecore/src/lib/ecore/ecore_value.c
index d893809b45..34a6d37912 100644
--- a/legacy/ecore/src/lib/ecore/ecore_value.c
+++ b/legacy/ecore/src/lib/ecore/ecore_value.c
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24 24
25*/ 25*/
26 26
27#include <Ecore.h> 27#include "ecore_private.h"
28 28
29const unsigned int ecore_prime_table[] = { 17, 31, 61, 127, 257, 509, 1021, 29const unsigned int ecore_prime_table[] = { 17, 31, 61, 127, 257, 509, 1021,
30 2053, 4093, 8191, 16381, 32771, 65537, 131071, 262147, 524287, 1048573, 30 2053, 4093, 8191, 16381, 32771, 65537, 131071, 262147, 524287, 1048573,
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
index 6081a01eb2..cc49ee7987 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
@@ -1,6 +1,8 @@
1#ifndef _ECORE_CON_PRIVATE_H 1#ifndef _ECORE_CON_PRIVATE_H
2#define _ECORE_CON_PRIVATE_H 2#define _ECORE_CON_PRIVATE_H
3 3
4#include "Ecore_Data.h"
5
4#define ECORE_MAGIC_CON_SERVER 0x77665544 6#define ECORE_MAGIC_CON_SERVER 0x77665544
5#define ECORE_MAGIC_CON_CLIENT 0x77556677 7#define ECORE_MAGIC_CON_CLIENT 0x77556677
6 8
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
index 8bd6f92d51..decfd5ff93 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
@@ -4,6 +4,8 @@
4#ifndef _ECORE_EVAS_PRIVATE_H 4#ifndef _ECORE_EVAS_PRIVATE_H
5#define _ECORE_EVAS_PRIVATE_H 5#define _ECORE_EVAS_PRIVATE_H
6 6
7#include "Ecore_Data.h"
8
7#include <sys/types.h> 9#include <sys/types.h>
8#include <sys/stat.h> 10#include <sys/stat.h>
9#include <fcntl.h> 11#include <fcntl.h>
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
index 0e4d6eae34..6269b06461 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
@@ -1,6 +1,8 @@
1#ifndef _ECORE_IPC_PRIVATE_H 1#ifndef _ECORE_IPC_PRIVATE_H
2#define _ECORE_IPC_PRIVATE_H 2#define _ECORE_IPC_PRIVATE_H
3 3
4#include "Ecore_Data.h"
5
4#if USE_OPENSSL 6#if USE_OPENSSL
5#include <openssl/ssl.h> 7#include <openssl/ssl.h>
6#endif 8#endif
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
index 89e398e112..11ec16c35a 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
@@ -31,6 +31,7 @@
31#include <X11/extensions/Xrandr.h> 31#include <X11/extensions/Xrandr.h>
32#endif 32#endif
33 33
34#include "ecore_private.h"
34#include "Ecore_X.h" 35#include "Ecore_X.h"
35 36
36/* FIXME: this is for simulation only */ 37/* FIXME: this is for simulation only */