From 72b87160a2bd50950df6bc17171f68c956c87a38 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 28 Aug 2009 12:03:34 +0000 Subject: [PATCH] * add eina_config.h in all source files. Fix linking with Visual Studio * move eina_private.h and eina_safety_checks.h just after eina_config.h SVN revision: 42077 --- legacy/eina/src/include/eina_private.h | 2 -- legacy/eina/src/lib/eina_accessor.c | 4 ++-- legacy/eina/src/lib/eina_array.c | 6 +++--- legacy/eina/src/lib/eina_benchmark.c | 1 + legacy/eina/src/lib/eina_convert.c | 3 ++- legacy/eina/src/lib/eina_counter.c | 5 +++-- legacy/eina/src/lib/eina_cpu.c | 10 ++++++++++ legacy/eina/src/lib/eina_error.c | 5 +++-- legacy/eina/src/lib/eina_file.c | 3 ++- legacy/eina/src/lib/eina_hamster.c | 2 ++ legacy/eina/src/lib/eina_hash.c | 5 +++-- legacy/eina/src/lib/eina_inlist.c | 5 +++-- legacy/eina/src/lib/eina_iterator.c | 4 ++-- legacy/eina/src/lib/eina_lalloc.c | 3 ++- legacy/eina/src/lib/eina_list.c | 4 ++-- legacy/eina/src/lib/eina_log.c | 5 +++-- legacy/eina/src/lib/eina_magic.c | 2 +- legacy/eina/src/lib/eina_main.c | 1 + legacy/eina/src/lib/eina_mempool.c | 5 +++-- legacy/eina/src/lib/eina_module.c | 5 +++-- legacy/eina/src/lib/eina_rbtree.c | 5 +++-- legacy/eina/src/lib/eina_rectangle.c | 4 ++-- legacy/eina/src/lib/eina_stringshare.c | 6 +++--- legacy/eina/src/lib/eina_tiler.c | 3 ++- legacy/eina/src/lib/eina_value.c | 2 +- 25 files changed, 62 insertions(+), 38 deletions(-) diff --git a/legacy/eina/src/include/eina_private.h b/legacy/eina/src/include/eina_private.h index ebb07a27c9..a8c9e56b24 100644 --- a/legacy/eina/src/include/eina_private.h +++ b/legacy/eina/src/include/eina_private.h @@ -21,8 +21,6 @@ #include -#include "eina_config.h" - #if HAVE___ATTRIBUTE__ # define __UNUSED__ __attribute__((unused)) #else diff --git a/legacy/eina/src/lib/eina_accessor.c b/legacy/eina/src/lib/eina_accessor.c index f89768a096..7396b5e2ac 100644 --- a/legacy/eina/src/lib/eina_accessor.c +++ b/legacy/eina/src/lib/eina_accessor.c @@ -25,10 +25,10 @@ #include +#include "eina_config.h" #include "eina_private.h" - -#include "eina_accessor.h" #include "eina_safety_checks.h" +#include "eina_accessor.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_array.c b/legacy/eina/src/lib/eina_array.c index c44bdd4e9b..007f091eb0 100644 --- a/legacy/eina/src/lib/eina_array.c +++ b/legacy/eina/src/lib/eina_array.c @@ -150,12 +150,12 @@ #include #include -#include "eina_types.h" +#include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_error.h" #include "eina_array.h" #include "eina_inline_array.x" -#include "eina_private.h" -#include "eina_safety_checks.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_benchmark.c b/legacy/eina/src/lib/eina_benchmark.c index e1de81e3c8..875cb37e38 100644 --- a/legacy/eina/src/lib/eina_benchmark.c +++ b/legacy/eina/src/lib/eina_benchmark.c @@ -53,6 +53,7 @@ void *alloca (size_t); # include #endif +#include "eina_config.h" #include "eina_benchmark.h" #include "eina_inlist.h" #include "eina_counter.h" diff --git a/legacy/eina/src/lib/eina_convert.c b/legacy/eina/src/lib/eina_convert.c index 27fac408c6..1469710afc 100644 --- a/legacy/eina/src/lib/eina_convert.c +++ b/legacy/eina/src/lib/eina_convert.c @@ -24,8 +24,9 @@ #include #include -#include "eina_convert.h" +#include "eina_config.h" #include "eina_safety_checks.h" +#include "eina_convert.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_counter.c b/legacy/eina/src/lib/eina_counter.c index f76d42c933..e12036b010 100644 --- a/legacy/eina/src/lib/eina_counter.c +++ b/legacy/eina/src/lib/eina_counter.c @@ -32,11 +32,12 @@ # undef WIN32_LEAN_AND_MEAN #endif /* _WIN2 */ +#include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_counter.h" #include "eina_inlist.h" #include "eina_error.h" -#include "eina_private.h" -#include "eina_safety_checks.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_cpu.c b/legacy/eina/src/lib/eina_cpu.c index a56b053015..dec4686f75 100644 --- a/legacy/eina/src/lib/eina_cpu.c +++ b/legacy/eina/src/lib/eina_cpu.c @@ -132,6 +132,16 @@ EAPI int eina_cpu_count(void) return sysinfo.dwNumberOfProcessors; # elif defined (__SUNPRO_C) + /* + * _SC_NPROCESSORS_ONLN: number of processors that are online, that + is available when sysconf is called. The number + of cpu can change by admins. + * _SC_NPROCESSORS_CONF: maximum number of processors that are available + to the current OS instance. That number can be + change after a reboot. + * _SC_NPROCESSORS_MAX : maximum number of processors that are on the + motherboard. + */ return sysconf(_SC_NPROCESSORS_ONLN); # elif defined (__FreeBSD) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__DragonFly__) || defined (__MacOSX__) diff --git a/legacy/eina/src/lib/eina_error.c b/legacy/eina/src/lib/eina_error.c index 0cd8f45442..38d355db3f 100644 --- a/legacy/eina/src/lib/eina_error.c +++ b/legacy/eina/src/lib/eina_error.c @@ -358,10 +358,11 @@ # include #endif -#include "eina_error.h" -#include "eina_inlist.h" +#include "eina_config.h" #include "eina_private.h" #include "eina_safety_checks.h" +#include "eina_error.h" +#include "eina_inlist.h" /* TODO * + printing errors to stdout or stderr can be implemented diff --git a/legacy/eina/src/lib/eina_file.c b/legacy/eina/src/lib/eina_file.c index 0a436c8fe9..04d2f0fefe 100644 --- a/legacy/eina/src/lib/eina_file.c +++ b/legacy/eina/src/lib/eina_file.c @@ -61,9 +61,10 @@ void *alloca (size_t); # define PATH_DELIM '\\' #endif -#include "eina_file.h" +#include "eina_config.h" #include "eina_private.h" #include "eina_safety_checks.h" +#include "eina_file.h" /*============================================================================* * Global * diff --git a/legacy/eina/src/lib/eina_hamster.c b/legacy/eina/src/lib/eina_hamster.c index e7c8732230..2c2a86d2ba 100644 --- a/legacy/eina/src/lib/eina_hamster.c +++ b/legacy/eina/src/lib/eina_hamster.c @@ -23,7 +23,9 @@ #include #include +#include "eina_config.h" #include "eina_types.h" +#include "eina_hamster.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_hash.c b/legacy/eina/src/lib/eina_hash.c index 8f64d146dc..f6572ca056 100644 --- a/legacy/eina/src/lib/eina_hash.c +++ b/legacy/eina/src/lib/eina_hash.c @@ -30,11 +30,12 @@ # include #endif +#include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_hash.h" #include "eina_rbtree.h" #include "eina_error.h" -#include "eina_private.h" -#include "eina_safety_checks.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_inlist.c b/legacy/eina/src/lib/eina_inlist.c index 8d922bc5e0..5f284bc47f 100644 --- a/legacy/eina/src/lib/eina_inlist.c +++ b/legacy/eina/src/lib/eina_inlist.c @@ -23,10 +23,11 @@ #include #include -#include "eina_inlist.h" -#include "eina_error.h" +#include "eina_config.h" #include "eina_private.h" #include "eina_safety_checks.h" +#include "eina_inlist.h" +#include "eina_error.h" /* FIXME: TODO please, refactor this :) */ diff --git a/legacy/eina/src/lib/eina_iterator.c b/legacy/eina/src/lib/eina_iterator.c index 24644d0baa..7ef4e329fe 100644 --- a/legacy/eina/src/lib/eina_iterator.c +++ b/legacy/eina/src/lib/eina_iterator.c @@ -25,10 +25,10 @@ #include +#include "eina_config.h" #include "eina_private.h" - -#include "eina_iterator.h" #include "eina_safety_checks.h" +#include "eina_iterator.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_lalloc.c b/legacy/eina/src/lib/eina_lalloc.c index 767e123404..610dce81ef 100644 --- a/legacy/eina/src/lib/eina_lalloc.c +++ b/legacy/eina/src/lib/eina_lalloc.c @@ -22,9 +22,10 @@ #include -#include "eina_lalloc.h" +#include "eina_config.h" #include "eina_private.h" #include "eina_safety_checks.h" +#include "eina_lalloc.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_list.c b/legacy/eina/src/lib/eina_list.c index 2e2db79537..fd38dab3d8 100644 --- a/legacy/eina/src/lib/eina_list.c +++ b/legacy/eina/src/lib/eina_list.c @@ -73,11 +73,11 @@ #endif #include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_error.h" #include "eina_list.h" #include "eina_mempool.h" -#include "eina_private.h" -#include "eina_safety_checks.h" /*============================================================================* diff --git a/legacy/eina/src/lib/eina_log.c b/legacy/eina/src/lib/eina_log.c index c3a28f74b2..2e216060ea 100644 --- a/legacy/eina/src/lib/eina_log.c +++ b/legacy/eina/src/lib/eina_log.c @@ -289,10 +289,11 @@ # include #endif -#include "eina_log.h" -#include "eina_inlist.h" +#include "eina_config.h" #include "eina_private.h" #include "eina_safety_checks.h" +#include "eina_log.h" +#include "eina_inlist.h" /* TODO * + printing logs to stdout or stderr can be implemented diff --git a/legacy/eina/src/lib/eina_magic.c b/legacy/eina/src/lib/eina_magic.c index 9ca2a52421..24fda8ad10 100644 --- a/legacy/eina/src/lib/eina_magic.c +++ b/legacy/eina/src/lib/eina_magic.c @@ -28,10 +28,10 @@ #endif #include "eina_config.h" -#include "eina_magic.h" #include "eina_private.h" #include "eina_error.h" #include "eina_inlist.h" +#include "eina_magic.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_main.c b/legacy/eina/src/lib/eina_main.c index 39fc4206d6..7b753374e0 100644 --- a/legacy/eina/src/lib/eina_main.c +++ b/legacy/eina/src/lib/eina_main.c @@ -22,6 +22,7 @@ # include "config.h" #endif +#include "eina_config.h" #include "eina_types.h" #include "eina_main.h" #include "eina_error.h" diff --git a/legacy/eina/src/lib/eina_mempool.c b/legacy/eina/src/lib/eina_mempool.c index 9669331e37..5e2b1b75bb 100644 --- a/legacy/eina/src/lib/eina_mempool.c +++ b/legacy/eina/src/lib/eina_mempool.c @@ -25,11 +25,12 @@ #include #include +#include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_mempool.h" #include "eina_hash.h" #include "eina_module.h" -#include "eina_private.h" -#include "eina_safety_checks.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c index 5e1b83de93..0cc835b25b 100644 --- a/legacy/eina/src/lib/eina_module.c +++ b/legacy/eina/src/lib/eina_module.c @@ -52,11 +52,12 @@ void *alloca (size_t); # include #endif +#include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_error.h" #include "eina_module.h" #include "eina_file.h" -#include "eina_private.h" -#include "eina_safety_checks.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_rbtree.c b/legacy/eina/src/lib/eina_rbtree.c index 758ba47256..4c328e8d81 100644 --- a/legacy/eina/src/lib/eina_rbtree.c +++ b/legacy/eina/src/lib/eina_rbtree.c @@ -24,10 +24,11 @@ #include #include -#include "eina_rbtree.h" -#include "eina_array.h" +#include "eina_config.h" #include "eina_private.h" #include "eina_safety_checks.h" +#include "eina_rbtree.h" +#include "eina_array.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_rectangle.c b/legacy/eina/src/lib/eina_rectangle.c index 9600c7f9b8..d624c1d15a 100644 --- a/legacy/eina/src/lib/eina_rectangle.c +++ b/legacy/eina/src/lib/eina_rectangle.c @@ -24,11 +24,11 @@ #include #include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_rectangle.h" #include "eina_magic.h" #include "eina_inlist.h" -#include "eina_private.h" -#include "eina_safety_checks.h" #include "eina_mempool.h" #include "eina_list.h" #include "eina_trash.h" diff --git a/legacy/eina/src/lib/eina_stringshare.c b/legacy/eina/src/lib/eina_stringshare.c index ba3e0e1afe..8decc098e8 100644 --- a/legacy/eina/src/lib/eina_stringshare.c +++ b/legacy/eina/src/lib/eina_stringshare.c @@ -74,13 +74,13 @@ # include #endif +#include "eina_config.h" +#include "eina_private.h" +#include "eina_safety_checks.h" #include "eina_stringshare.h" #include "eina_hash.h" #include "eina_rbtree.h" #include "eina_error.h" -#include "eina_private.h" -#include "eina_magic.h" -#include "eina_safety_checks.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_tiler.c b/legacy/eina/src/lib/eina_tiler.c index 78328ff936..0e444c7615 100644 --- a/legacy/eina/src/lib/eina_tiler.c +++ b/legacy/eina/src/lib/eina_tiler.c @@ -29,8 +29,9 @@ #include #include -#include "eina_tiler.h" +#include "eina_config.h" #include "eina_private.h" +#include "eina_tiler.h" /*============================================================================* * Local * diff --git a/legacy/eina/src/lib/eina_value.c b/legacy/eina/src/lib/eina_value.c index dc4802537a..901bc6b927 100644 --- a/legacy/eina/src/lib/eina_value.c +++ b/legacy/eina/src/lib/eina_value.c @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # include "config.h" #endif -#include "eina_types.h" +#include "eina_config.h" #include "eina_private.h" /*============================================================================*