* 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
2009-08-28 12:03:34 +00:00 · 2009-08-28 12:03:34 +00:00 · 72b87160a2
parent c1e675d669
commit 72b87160a2
25 changed files with 62 additions and 38 deletions
--- a/legacy/eina/src/include/eina_private.h
+++ b/legacy/eina/src/include/eina_private.h
@ -21,8 +21,6 @@

 #include <stdarg.h>

-#include "eina_config.h"
-
 #if HAVE___ATTRIBUTE__
 # define __UNUSED__ __attribute__((unused))
 #else
--- a/legacy/eina/src/lib/eina_accessor.c
+++ b/legacy/eina/src/lib/eina_accessor.c
@ -25,10 +25,10 @@

 #include <stdlib.h>

+#include "eina_config.h"
 #include "eina_private.h"
-
-#include "eina_accessor.h"
 #include "eina_safety_checks.h"
+#include "eina_accessor.h"

 /*============================================================================*
 *                                  Local                                     *
--- a/legacy/eina/src/lib/eina_array.c
+++ b/legacy/eina/src/lib/eina_array.c
@ -150,12 +150,12 @@
 #include <string.h>
 #include <stdio.h>

-#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                                     *
--- 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 <Evil.h>
 #endif

+#include "eina_config.h"
 #include "eina_benchmark.h"
 #include "eina_inlist.h"
 #include "eina_counter.h"
--- a/legacy/eina/src/lib/eina_convert.c
+++ b/legacy/eina/src/lib/eina_convert.c
@ -24,8 +24,9 @@
 #include <stdlib.h>
 #include <string.h>

-#include "eina_convert.h"
+#include "eina_config.h"
 #include "eina_safety_checks.h"
+#include "eina_convert.h"

 /*============================================================================*
 *                                  Local                                     *
--- 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                                     *
--- 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__)
--- a/legacy/eina/src/lib/eina_error.c
+++ b/legacy/eina/src/lib/eina_error.c
@ -358,10 +358,11 @@
 # include <Evil.h>
 #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
--- 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                                     *
--- a/legacy/eina/src/lib/eina_hamster.c
+++ b/legacy/eina/src/lib/eina_hamster.c
@ -23,7 +23,9 @@
 #include <stdio.h>
 #include <string.h>

+#include "eina_config.h"
 #include "eina_types.h"
+#include "eina_hamster.h"

 /*============================================================================*
 *                                  Local                                     *
--- a/legacy/eina/src/lib/eina_hash.c
+++ b/legacy/eina/src/lib/eina_hash.c
@ -30,11 +30,12 @@
 # include <stdint.h>
 #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                                     *
--- a/legacy/eina/src/lib/eina_inlist.c
+++ b/legacy/eina/src/lib/eina_inlist.c
@ -23,10 +23,11 @@
 #include <stdlib.h>
 #include <assert.h>

-#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 :) */

--- a/legacy/eina/src/lib/eina_iterator.c
+++ b/legacy/eina/src/lib/eina_iterator.c
@ -25,10 +25,10 @@

 #include <stdlib.h>

+#include "eina_config.h"
 #include "eina_private.h"
-
-#include "eina_iterator.h"
 #include "eina_safety_checks.h"
+#include "eina_iterator.h"

 /*============================================================================*
 *                                  Local                                     *
--- a/legacy/eina/src/lib/eina_lalloc.c
+++ b/legacy/eina/src/lib/eina_lalloc.c
@ -22,9 +22,10 @@

 #include <stdlib.h>

-#include "eina_lalloc.h"
+#include "eina_config.h"
 #include "eina_private.h"
 #include "eina_safety_checks.h"
+#include "eina_lalloc.h"

 /*============================================================================*
 *                                  Local                                     *
--- 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"


 /*============================================================================*
--- a/legacy/eina/src/lib/eina_log.c
+++ b/legacy/eina/src/lib/eina_log.c
@ -289,10 +289,11 @@
 # include <Evil.h>
 #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
--- 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                                     *
--- 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"
--- a/legacy/eina/src/lib/eina_mempool.c
+++ b/legacy/eina/src/lib/eina_mempool.c
@ -25,11 +25,12 @@
 #include <stdio.h>
 #include <string.h>

+#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                                     *
--- 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 <Evil.h>
 #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                                     *
--- a/legacy/eina/src/lib/eina_rbtree.c
+++ b/legacy/eina/src/lib/eina_rbtree.c
@ -24,10 +24,11 @@
 #include <stdio.h>
 #include <string.h>

-#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                                     *
--- a/legacy/eina/src/lib/eina_rectangle.c
+++ b/legacy/eina/src/lib/eina_rectangle.c
@ -24,11 +24,11 @@
 #include <stdlib.h>

 #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"
--- a/legacy/eina/src/lib/eina_stringshare.c
+++ b/legacy/eina/src/lib/eina_stringshare.c
@ -74,13 +74,13 @@
 # include <Evil.h>
 #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                                     *
--- a/legacy/eina/src/lib/eina_tiler.c
+++ b/legacy/eina/src/lib/eina_tiler.c
@ -29,8 +29,9 @@
 #include <stdlib.h>
 #include <stdio.h>

-#include "eina_tiler.h"
+#include "eina_config.h"
 #include "eina_private.h"
+#include "eina_tiler.h"

 /*============================================================================*
 *                                  Local                                     *
--- 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"

 /*============================================================================*