From 23316c62b6fde12dd7fc0cac7c84648bedf47737 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Tue, 23 Mar 2010 06:41:17 +0000
Subject: fix most compilation errors with vc++ (there are still a problem with
 eina_log and output of the log messages: STDERR_FILENO, STDOUT_FILENO and
 isatty())

fix some warnings and header files inclusion

update vcproj files


SVN revision: 47384
---
 src/lib/eina_log.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/lib/eina_log.c')

diff --git a/src/lib/eina_log.c b/src/lib/eina_log.c
index e4d8dce..678a7b5 100644
--- a/src/lib/eina_log.c
+++ b/src/lib/eina_log.c
@@ -265,9 +265,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <fnmatch.h>
-#include <unistd.h>
 #include <assert.h>
 
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+
 #ifdef EFL_HAVE_PTHREAD
 # include <pthread.h>
 #endif
@@ -315,7 +318,7 @@ struct _Eina_Log_Domain_Level_Pending
 {
    EINA_INLIST;
    unsigned int level;
-   unsigned int namelen;
+   size_t namelen;
    char name[];
 };
 
@@ -394,7 +397,7 @@ static pthread_mutex_t _log_mutex = PTHREAD_MUTEX_INITIALIZER;
 // List of domains registered
 static Eina_Log_Domain *_log_domains = NULL;
 static unsigned int _log_domains_count = 0;
-static unsigned int _log_domains_allocated = 0;
+static size_t _log_domains_allocated = 0;
 
 // Default function for printing on domains
 static Eina_Log_Print_Cb _print_cb = eina_log_print_cb_stderr;
@@ -839,7 +842,8 @@ static inline int
 eina_log_domain_register_unlocked(const char *name, const char *color)
 {
    Eina_Log_Domain_Level_Pending *pending = NULL;
-   unsigned int i, namelen;
+   size_t namelen;
+   unsigned int i;
 
    for (i = 0; i < _log_domains_count; i++)
      {
@@ -1567,7 +1571,8 @@ EAPI void
 eina_log_domain_level_set(const char *domain_name, int level)
 {
    Eina_Log_Domain_Level_Pending *pending;
-   unsigned int i, namelen;
+   size_t namelen;
+   unsigned int i;
 
    EINA_SAFETY_ON_NULL_RETURN(domain_name);
 
@@ -1627,7 +1632,8 @@ EAPI int
 eina_log_domain_level_get(const char *domain_name)
 {
    Eina_Log_Domain_Level_Pending *pending;
-   unsigned int i, namelen;
+   size_t namelen;
+   unsigned int i;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(domain_name, EINA_LOG_LEVEL_UNKNOWN);
 
-- 
cgit v1.2.1