diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/eina/src/lib/eina_main.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/eina/src/lib/eina_main.c')
-rw-r--r-- | libraries/eina/src/lib/eina_main.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libraries/eina/src/lib/eina_main.c b/libraries/eina/src/lib/eina_main.c index 8727f83..79f8a36 100644 --- a/libraries/eina/src/lib/eina_main.c +++ b/libraries/eina/src/lib/eina_main.c | |||
@@ -67,6 +67,8 @@ | |||
67 | #include "eina_rectangle.h" | 67 | #include "eina_rectangle.h" |
68 | #include "eina_safety_checks.h" | 68 | #include "eina_safety_checks.h" |
69 | #include "eina_inlist.h" | 69 | #include "eina_inlist.h" |
70 | #include "eina_inarray.h" | ||
71 | #include "eina_value.h" | ||
70 | 72 | ||
71 | /*============================================================================* | 73 | /*============================================================================* |
72 | * Local * | 74 | * Local * |
@@ -131,6 +133,7 @@ EAPI Eina_Inlist *_eina_tracking = NULL; | |||
131 | S(magic_string); | 133 | S(magic_string); |
132 | S(iterator); | 134 | S(iterator); |
133 | S(accessor); | 135 | S(accessor); |
136 | S(inarray); | ||
134 | S(array); | 137 | S(array); |
135 | S(module); | 138 | S(module); |
136 | S(mempool); | 139 | S(mempool); |
@@ -149,6 +152,7 @@ EAPI Eina_Inlist *_eina_tracking = NULL; | |||
149 | S(simple_xml); | 152 | S(simple_xml); |
150 | S(file); | 153 | S(file); |
151 | S(prefix); | 154 | S(prefix); |
155 | S(value); | ||
152 | #undef S | 156 | #undef S |
153 | 157 | ||
154 | struct eina_desc_setup | 158 | struct eina_desc_setup |
@@ -161,17 +165,18 @@ struct eina_desc_setup | |||
161 | static const struct eina_desc_setup _eina_desc_setup[] = { | 165 | static const struct eina_desc_setup _eina_desc_setup[] = { |
162 | #define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown} | 166 | #define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown} |
163 | /* log is a special case as it needs printf */ | 167 | /* log is a special case as it needs printf */ |
168 | S(stringshare), | ||
164 | S(error), | 169 | S(error), |
165 | S(safety_checks), | 170 | S(safety_checks), |
166 | S(magic_string), | 171 | S(magic_string), |
167 | S(iterator), | 172 | S(iterator), |
168 | S(accessor), | 173 | S(accessor), |
174 | S(inarray), | ||
169 | S(array), | 175 | S(array), |
170 | S(module), | 176 | S(module), |
171 | S(mempool), | 177 | S(mempool), |
172 | S(list), | 178 | S(list), |
173 | S(binshare), | 179 | S(binshare), |
174 | S(stringshare), | ||
175 | S(ustringshare), | 180 | S(ustringshare), |
176 | S(matrixsparse), | 181 | S(matrixsparse), |
177 | S(convert), | 182 | S(convert), |
@@ -183,7 +188,8 @@ static const struct eina_desc_setup _eina_desc_setup[] = { | |||
183 | S(quadtree), | 188 | S(quadtree), |
184 | S(simple_xml), | 189 | S(simple_xml), |
185 | S(file), | 190 | S(file), |
186 | S(prefix) | 191 | S(prefix), |
192 | S(value) | ||
187 | #undef S | 193 | #undef S |
188 | }; | 194 | }; |
189 | static const size_t _eina_desc_setup_len = sizeof(_eina_desc_setup) / | 195 | static const size_t _eina_desc_setup_len = sizeof(_eina_desc_setup) / |
@@ -236,8 +242,8 @@ eina_init(void) | |||
236 | _mt_enabled = 1; | 242 | _mt_enabled = 1; |
237 | mtrace(); | 243 | mtrace(); |
238 | } | 244 | } |
239 | #endif | 245 | #endif |
240 | 246 | ||
241 | if (!eina_log_init()) | 247 | if (!eina_log_init()) |
242 | { | 248 | { |
243 | fprintf(stderr, "Could not initialize eina logging system.\n"); | 249 | fprintf(stderr, "Could not initialize eina logging system.\n"); |
@@ -304,7 +310,7 @@ eina_shutdown(void) | |||
304 | muntrace(); | 310 | muntrace(); |
305 | _mt_enabled = 0; | 311 | _mt_enabled = 0; |
306 | } | 312 | } |
307 | #endif | 313 | #endif |
308 | } | 314 | } |
309 | 315 | ||
310 | return _eina_main_count; | 316 | return _eina_main_count; |