summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-04-27 16:57:14 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-04-27 16:57:14 +0000
commitd7d0cd0d79b9da65c2f1a0874bb4571fe728fa11 (patch)
tree87664d96f80b04b6f32570cee34c8f84b6ca71b5
parentfe99f9b5028b3d37ca78db2e2bcb8a18a7a862a1 (diff)
formatting: alphabetical order
SVN revision: 58972
-rw-r--r--configure.ac4
-rw-r--r--src/lib/Makefile.am8
-rw-r--r--src/lib/eina_mempool.c58
3 files changed, 35 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac
index 7c241ac..edd5be5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -669,13 +669,13 @@ echo " SSE2...............: ${have_sse2}"
669echo " ALTIVEC............: ${have_altivec}" 669echo " ALTIVEC............: ${have_altivec}"
670echo 670echo
671echo " Memory pools:" 671echo " Memory pools:"
672echo " Buddy..............: ${enable_buddy}"
672echo " Chained pool.......: ${enable_chained_pool}" 673echo " Chained pool.......: ${enable_chained_pool}"
673echo " Ememoa fixed.......: ${enable_ememoa_fixed}" 674echo " Ememoa fixed.......: ${enable_ememoa_fixed}"
674echo " Ememoa unknown.....: ${enable_ememoa_unknown}" 675echo " Ememoa unknown.....: ${enable_ememoa_unknown}"
675echo " Fixed bitmap.......: ${enable_fixed_bitmap}" 676echo " Fixed bitmap.......: ${enable_fixed_bitmap}"
676echo " Pass through.......: ${enable_pass_through}"
677echo " Buddy..............: ${enable_buddy}"
678echo " One big............: ${enable_one_big}" 677echo " One big............: ${enable_one_big}"
678echo " Pass through.......: ${enable_pass_through}"
679echo 679echo
680echo "Compilation............: make (or gmake)" 680echo "Compilation............: make (or gmake)"
681echo " CPPFLAGS.............: $CPPFLAGS" 681echo " CPPFLAGS.............: $CPPFLAGS"
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fac41ad..cefcdfa 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -65,10 +65,6 @@ if EINA_STATIC_BUILD_CHAINED_POOL
65base_sources += $(top_srcdir)/src/modules/mp/chained_pool/eina_chained_mempool.c 65base_sources += $(top_srcdir)/src/modules/mp/chained_pool/eina_chained_mempool.c
66endif 66endif
67 67
68if EINA_STATIC_BUILD_ONE_BIG
69base_sources += $(top_srcdir)/src/modules/mp/one_big/eina_one_big.c
70endif
71
72if EINA_STATIC_BUILD_EMEMOA_FIXED 68if EINA_STATIC_BUILD_EMEMOA_FIXED
73base_sources += $(top_srcdir)/src/modules/mp/ememoa_fixed/eina_ememoa_fixed.c 69base_sources += $(top_srcdir)/src/modules/mp/ememoa_fixed/eina_ememoa_fixed.c
74endif 70endif
@@ -81,6 +77,10 @@ if EINA_STATIC_BUILD_FIXED_BITMAP
81base_sources += $(top_srcdir)/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c 77base_sources += $(top_srcdir)/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c
82endif 78endif
83 79
80if EINA_STATIC_BUILD_ONE_BIG
81base_sources += $(top_srcdir)/src/modules/mp/one_big/eina_one_big.c
82endif
83
84if EINA_STATIC_BUILD_PASS_THROUGH 84if EINA_STATIC_BUILD_PASS_THROUGH
85base_sources += $(top_srcdir)/src/modules/mp/pass_through/eina_pass_through.c 85base_sources += $(top_srcdir)/src/modules/mp/pass_through/eina_pass_through.c
86endif 86endif
diff --git a/src/lib/eina_mempool.c b/src/lib/eina_mempool.c
index 9d25e8a..4ef8709 100644
--- a/src/lib/eina_mempool.c
+++ b/src/lib/eina_mempool.c
@@ -92,14 +92,19 @@ on_error:
92} 92}
93 93
94/* Built-in backend's prototypes */ 94/* Built-in backend's prototypes */
95#ifdef EINA_STATIC_BUILD_BUDDY
96Eina_Bool buddy_init(void);
97void buddy_shutdown(void);
98#endif
99
95#ifdef EINA_STATIC_BUILD_CHAINED_POOL 100#ifdef EINA_STATIC_BUILD_CHAINED_POOL
96Eina_Bool chained_init(void); 101Eina_Bool chained_init(void);
97void chained_shutdown(void); 102void chained_shutdown(void);
98#endif 103#endif
99 104
100#ifdef EINA_STATIC_BUILD_PASS_THROUGH 105#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED
101Eina_Bool pass_through_init(void); 106Eina_Bool ememoa_fixed_init(void);
102void pass_through_shutdown(void); 107void ememoa_fixed_shutdown(void);
103#endif 108#endif
104 109
105#ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN 110#ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN
@@ -107,26 +112,21 @@ Eina_Bool ememoa_unknown_init(void);
107void ememoa_unknown_shutdown(void); 112void ememoa_unknown_shutdown(void);
108#endif 113#endif
109 114
110#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED
111Eina_Bool ememoa_fixed_init(void);
112void ememoa_fixed_shutdown(void);
113#endif
114
115#ifdef EINA_STATIC_BUILD_FIXED_BITMAP 115#ifdef EINA_STATIC_BUILD_FIXED_BITMAP
116Eina_Bool fixed_bitmap_init(void); 116Eina_Bool fixed_bitmap_init(void);
117void fixed_bitmap_shutdown(void); 117void fixed_bitmap_shutdown(void);
118#endif 118#endif
119 119
120#ifdef EINA_STATIC_BUILD_BUDDY
121Eina_Bool buddy_init(void);
122void buddy_shutdown(void);
123#endif
124
125#ifdef EINA_STATIC_BUILD_ONE_BIG 120#ifdef EINA_STATIC_BUILD_ONE_BIG
126Eina_Bool one_big_init(void); 121Eina_Bool one_big_init(void);
127void one_big_shutdown(void); 122void one_big_shutdown(void);
128#endif 123#endif
129 124
125#ifdef EINA_STATIC_BUILD_PASS_THROUGH
126Eina_Bool pass_through_init(void);
127void pass_through_shutdown(void);
128#endif
129
130/** 130/**
131 * @endcond 131 * @endcond
132 */ 132 */
@@ -213,27 +213,27 @@ eina_mempool_init(void)
213 eina_module_list_load(_modules); 213 eina_module_list_load(_modules);
214 214
215 /* builtin backends */ 215 /* builtin backends */
216#ifdef EINA_STATIC_BUILD_BUDDY
217 buddy_init();
218#endif
216#ifdef EINA_STATIC_BUILD_CHAINED_POOL 219#ifdef EINA_STATIC_BUILD_CHAINED_POOL
217 chained_init(); 220 chained_init();
218#endif 221#endif
219#ifdef EINA_STATIC_BUILD_PASS_THROUGH 222#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED
220 pass_through_init(); 223 ememoa_fixed_init();
221#endif 224#endif
222#ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN 225#ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN
223 ememoa_unknown_init(); 226 ememoa_unknown_init();
224#endif 227#endif
225#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED
226 ememoa_fixed_init();
227#endif
228#ifdef EINA_STATIC_BUILD_FIXED_BITMAP 228#ifdef EINA_STATIC_BUILD_FIXED_BITMAP
229 fixed_bitmap_init(); 229 fixed_bitmap_init();
230#endif 230#endif
231#ifdef EINA_STATIC_BUILD_BUDDY
232 buddy_init();
233#endif
234#ifdef EINA_STATIC_BUILD_ONE_BIG 231#ifdef EINA_STATIC_BUILD_ONE_BIG
235 one_big_init(); 232 one_big_init();
236#endif 233#endif
234#ifdef EINA_STATIC_BUILD_PASS_THROUGH
235 pass_through_init();
236#endif
237 237
238 return EINA_TRUE; 238 return EINA_TRUE;
239 239
@@ -248,27 +248,27 @@ Eina_Bool
248eina_mempool_shutdown(void) 248eina_mempool_shutdown(void)
249{ 249{
250 /* builtin backends */ 250 /* builtin backends */
251#ifdef EINA_STATIC_BUILD_BUDDY
252 buddy_shutdown();
253#endif
251#ifdef EINA_STATIC_BUILD_CHAINED_POOL 254#ifdef EINA_STATIC_BUILD_CHAINED_POOL
252 chained_shutdown(); 255 chained_shutdown();
253#endif 256#endif
254#ifdef EINA_STATIC_BUILD_PASS_THROUGH 257#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED
255 pass_through_shutdown(); 258 ememoa_fixed_shutdown();
256#endif 259#endif
257#ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN 260#ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN
258 ememoa_unknown_shutdown(); 261 ememoa_unknown_shutdown();
259#endif 262#endif
260#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED
261 ememoa_fixed_shutdown();
262#endif
263#ifdef EINA_STATIC_BUILD_FIXED_BITMAP 263#ifdef EINA_STATIC_BUILD_FIXED_BITMAP
264 fixed_bitmap_shutdown(); 264 fixed_bitmap_shutdown();
265#endif 265#endif
266#ifdef EINA_STATIC_BUILD_BUDDY
267 buddy_shutdown();
268#endif
269#ifdef EINA_STATIC_BUILD_ONE_BIG 266#ifdef EINA_STATIC_BUILD_ONE_BIG
270 one_big_shutdown(); 267 one_big_shutdown();
271#endif 268#endif
269#ifdef EINA_STATIC_BUILD_PASS_THROUGH
270 pass_through_shutdown();
271#endif
272 /* dynamic backends */ 272 /* dynamic backends */
273 eina_module_list_free(_modules); 273 eina_module_list_free(_modules);
274 if (_modules) 274 if (_modules)