From 66ddd0e2b7136310fb8e2c4a6c213422decd39a0 Mon Sep 17 00:00:00 2001 From: caro Date: Wed, 27 Apr 2011 16:58:23 +0000 Subject: [PATCH] formatting: alphabetical order git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@58973 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 4 ++-- src/lib/Makefile.am | 16 +++++++------- src/lib/eina_mempool.c | 59 +++++++++++++++++++++++++------------------------- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/configure.ac b/configure.ac index 168478b..7ffaa24 100644 --- a/configure.ac +++ b/configure.ac @@ -696,13 +696,13 @@ echo " SSE2...............: ${have_sse2}" echo " ALTIVEC............: ${have_altivec}" echo echo " Memory pools:" +echo " Buddy..............: ${enable_buddy}" echo " Chained pool.......: ${enable_chained_pool}" echo " Ememoa fixed.......: ${enable_ememoa_fixed}" echo " Ememoa unknown.....: ${enable_ememoa_unknown}" echo " Fixed bitmap.......: ${enable_fixed_bitmap}" -echo " Pass through.......: ${enable_pass_through}" -echo " Buddy..............: ${enable_buddy}" echo " One big............: ${enable_one_big}" +echo " Pass through.......: ${enable_pass_through}" echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index b7fbfe0..d57bbe6 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -31,12 +31,15 @@ eina_main.c \ eina_matrixsparse.c \ eina_mempool.c \ eina_module.c \ +eina_object.c \ +eina_prefix.c \ eina_quadtree.c \ eina_rbtree.c \ eina_rectangle.c \ eina_safety_checks.c \ eina_sched.c \ eina_share_common.c \ +eina_simple_xml_parser.c \ eina_str.c \ eina_strbuf.c \ eina_strbuf_common.c \ @@ -45,10 +48,7 @@ eina_tiler.c \ eina_unicode.c \ eina_ustrbuf.c \ eina_ustringshare.c \ -eina_value.c \ -eina_simple_xml_parser.c \ -eina_object.c \ -eina_prefix.c +eina_value.c if EINA_HAVE_WIN32 base_sources += eina_file_win32.c @@ -68,10 +68,6 @@ if EINA_STATIC_BUILD_CHAINED_POOL base_sources += $(top_srcdir)/src/modules/mp/chained_pool/eina_chained_mempool.c endif -if EINA_STATIC_BUILD_ONE_BIG -base_sources += $(top_srcdir)/src/modules/mp/one_big/eina_one_big.c -endif - if EINA_STATIC_BUILD_EMEMOA_FIXED base_sources += $(top_srcdir)/src/modules/mp/ememoa_fixed/eina_ememoa_fixed.c endif @@ -84,6 +80,10 @@ if EINA_STATIC_BUILD_FIXED_BITMAP base_sources += $(top_srcdir)/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c endif +if EINA_STATIC_BUILD_ONE_BIG +base_sources += $(top_srcdir)/src/modules/mp/one_big/eina_one_big.c +endif + if EINA_STATIC_BUILD_PASS_THROUGH base_sources += $(top_srcdir)/src/modules/mp/pass_through/eina_pass_through.c endif diff --git a/src/lib/eina_mempool.c b/src/lib/eina_mempool.c index 0322eee..065532e 100644 --- a/src/lib/eina_mempool.c +++ b/src/lib/eina_mempool.c @@ -109,14 +109,20 @@ on_error: } /* Built-in backend's prototypes */ + +#ifdef EINA_STATIC_BUILD_BUDDY +Eina_Bool buddy_init(void); +void buddy_shutdown(void); +#endif + #ifdef EINA_STATIC_BUILD_CHAINED_POOL Eina_Bool chained_init(void); void chained_shutdown(void); #endif -#ifdef EINA_STATIC_BUILD_PASS_THROUGH -Eina_Bool pass_through_init(void); -void pass_through_shutdown(void); +#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED +Eina_Bool ememoa_fixed_init(void); +void ememoa_fixed_shutdown(void); #endif #ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN @@ -124,26 +130,21 @@ Eina_Bool ememoa_unknown_init(void); void ememoa_unknown_shutdown(void); #endif -#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED -Eina_Bool ememoa_fixed_init(void); -void ememoa_fixed_shutdown(void); -#endif - #ifdef EINA_STATIC_BUILD_FIXED_BITMAP Eina_Bool fixed_bitmap_init(void); void fixed_bitmap_shutdown(void); #endif -#ifdef EINA_STATIC_BUILD_BUDDY -Eina_Bool buddy_init(void); -void buddy_shutdown(void); -#endif - #ifdef EINA_STATIC_BUILD_ONE_BIG Eina_Bool one_big_init(void); void one_big_shutdown(void); #endif +#ifdef EINA_STATIC_BUILD_PASS_THROUGH +Eina_Bool pass_through_init(void); +void pass_through_shutdown(void); +#endif + /** * @endcond */ @@ -230,27 +231,27 @@ eina_mempool_init(void) eina_module_list_load(_modules); /* builtin backends */ +#ifdef EINA_STATIC_BUILD_BUDDY + buddy_init(); +#endif #ifdef EINA_STATIC_BUILD_CHAINED_POOL chained_init(); #endif -#ifdef EINA_STATIC_BUILD_PASS_THROUGH - pass_through_init(); +#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED + ememoa_fixed_init(); #endif #ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN ememoa_unknown_init(); #endif -#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED - ememoa_fixed_init(); -#endif #ifdef EINA_STATIC_BUILD_FIXED_BITMAP fixed_bitmap_init(); #endif -#ifdef EINA_STATIC_BUILD_BUDDY - buddy_init(); -#endif #ifdef EINA_STATIC_BUILD_ONE_BIG one_big_init(); #endif +#ifdef EINA_STATIC_BUILD_PASS_THROUGH + pass_through_init(); +#endif return EINA_TRUE; @@ -265,27 +266,27 @@ Eina_Bool eina_mempool_shutdown(void) { /* builtin backends */ +#ifdef EINA_STATIC_BUILD_BUDDY + buddy_shutdown(); +#endif #ifdef EINA_STATIC_BUILD_CHAINED_POOL chained_shutdown(); #endif -#ifdef EINA_STATIC_BUILD_PASS_THROUGH - pass_through_shutdown(); +#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED + ememoa_fixed_shutdown(); #endif #ifdef EINA_STATIC_BUILD_EMEMOA_UNKNOWN ememoa_unknown_shutdown(); #endif -#ifdef EINA_STATIC_BUILD_EMEMOA_FIXED - ememoa_fixed_shutdown(); -#endif #ifdef EINA_STATIC_BUILD_FIXED_BITMAP fixed_bitmap_shutdown(); #endif -#ifdef EINA_STATIC_BUILD_BUDDY - buddy_shutdown(); -#endif #ifdef EINA_STATIC_BUILD_ONE_BIG one_big_shutdown(); #endif +#ifdef EINA_STATIC_BUILD_PASS_THROUGH + pass_through_shutdown(); +#endif /* dynamic backends */ eina_module_list_free(_modules); if (_modules) -- 2.7.4