make eina compile again on Windows CE

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@55853 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/eina_file_win32.c b/src/lib/eina_file_win32.c
index 7c2910e..f21a8f6 100644 (file)
--- a/src/lib/eina_file_win32.c
+++ b/src/lib/eina_file_win32.c
@@ -183,7 +183,11 @@ _eina_file_win32_first_file(const char *dir, WIN32_FIND_DATA *fd)
 static Eina_Bool\r
 _eina_file_win32_ls_iterator_next(Eina_File_Iterator *it, void **data)\r
 {\r
+#ifdef UNICODE\r
+   wchar_t  *old_name;\r
+#else\r
    char     *old_name;\r
+#endif\r
    char     *name;\r
    char     *cname;\r
    size_t    length;\r
@@ -194,7 +198,11 @@ _eina_file_win32_ls_iterator_next(Eina_File_Iterator *it, void **data)
      return EINA_FALSE;\r
 \r
    is_last = it->is_last;\r
-   old_name = strdup(it->data.cFileName);\r
+#ifdef UNICODE\r
+   old_name = _wcsdup(it->data.cFileName);\r
+#else\r
+   old_name = _strdup(it->data.cFileName);\r
+#endif\r
    if (!old_name)\r
      return EINA_FALSE;\r
 \r
@@ -208,7 +216,7 @@ _eina_file_win32_ls_iterator_next(Eina_File_Iterator *it, void **data)
         }\r
    } while ((it->data.cFileName[0] == '.') &&\r
             ((it->data.cFileName[1] == '\0') ||\r
-             ((it->data.cFileName[1] == '.') && (it->data.cFileName[2] == '\0'))));\r
+             ((it->data.cFileName[1] == '.') && (it->data.cFileName[2] == '\0')))); /* FIXME: what about UNICODE ? */\r
 \r
 #ifdef UNICODE\r
    cname = evil_wchar_to_char(old_name);\r
@@ -257,7 +265,11 @@ _eina_file_win32_ls_iterator_free(Eina_File_Iterator *it)
 static Eina_Bool\r
 _eina_file_win32_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **data)\r
 {\r
+#ifdef UNICODE\r
+   wchar_t  *old_name;\r
+#else\r
    char     *old_name;\r
+#endif\r
    char     *cname;\r
    size_t    length;\r
    DWORD     attr;\r
@@ -269,7 +281,11 @@ _eina_file_win32_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **d
 \r
    attr = it->data.dwFileAttributes;\r
    is_last = it->is_last;\r
-   old_name = strdup(it->data.cFileName);\r
+#ifdef UNICODE\r
+   old_name = _wcsdup(it->data.cFileName);\r
+#else\r
+   old_name = _strdup(it->data.cFileName);\r
+#endif\r
    if (!old_name)\r
      return EINA_FALSE;\r
 \r
@@ -282,17 +298,25 @@ _eina_file_win32_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **d
              res = EINA_FALSE;\r
         }\r
 \r
+#ifdef UNICODE\r
+     length = wcslen(old_name);\r
+#else\r
      length = strlen(old_name);\r
+#endif\r
      if (it->info.name_start + length + 1 >= PATH_MAX)\r
        {\r
           free(old_name);\r
-          old_name = strdup(it->data.cFileName);\r
+#ifdef UNICODE\r
+          old_name = _wcsdup(it->data.cFileName);\r
+#else\r
+          old_name = _strdup(it->data.cFileName);\r
+#endif\r
           continue;\r
        }\r
 \r
    } while ((it->data.cFileName[0] == '.') &&\r
             ((it->data.cFileName[1] == '\0') ||\r
-             ((it->data.cFileName[1] == '.') && (it->data.cFileName[2] == '\0'))));\r
+             ((it->data.cFileName[1] == '.') && (it->data.cFileName[2] == '\0')))); /* FIXME: what about UNICODE ? */\r
 \r
 #ifdef UNICODE\r
    cname = evil_wchar_to_char(old_name);\r

diff --git a/src/lib/eina_log.c b/src/lib/eina_log.c
index 8c04f46..33c021d 100644 (file)
--- a/src/lib/eina_log.c
+++ b/src/lib/eina_log.c
@@ -693,7 +693,10 @@ eina_log_print_prefix_NOthreads_color_file_func(FILE *fp,
                                                 int line)
 {
    DECLARE_LEVEL_NAME_COLOR(level);
-#ifdef _WIN32
+#ifdef _WIN32_WCE
+   fprintf(fp, "%s<%u>:%s %s:%d %s() ", name, eina_log_pid_get(), 
+           d->domain_str, file, line, fnc);
+#elif _WIN32
    SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE),
                            color);
    fprintf(fp, "%s", name);
@@ -731,7 +734,10 @@ eina_log_print_prefix_NOthreads_color_NOfile_func(FILE *fp,
                                                   int line __UNUSED__)
 {
    DECLARE_LEVEL_NAME_COLOR(level);
-#ifdef _WIN32
+#ifdef _WIN32_WCE
+   fprintf(fp, "%s<%u>:%s %s() ", name, eina_log_pid_get(), d->domain_str, 
+           fnc);
+#elif _WIN32
    SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE),
                            color);
    fprintf(fp, "%s", name);
@@ -766,7 +772,10 @@ eina_log_print_prefix_NOthreads_color_file_NOfunc(FILE *fp,
                                                   int line)
 {
    DECLARE_LEVEL_NAME_COLOR(level);
-#ifdef _WIN32
+#ifdef _WIN32_WCE
+   fprintf(fp, "%s<%u>:%s %s:%d ", name, eina_log_pid_get(), d->domain_str, 
+           file, line);
+#elif _WIN32
    SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE),
                            color);
    fprintf(fp, "%s", name);

diff --git a/src/lib/eina_quadtree.c b/src/lib/eina_quadtree.c
index 0aa47e2..daf03d0 100644 (file)
--- a/src/lib/eina_quadtree.c
+++ b/src/lib/eina_quadtree.c
@@ -30,6 +30,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifdef HAVE_EVIL
+# include <Evil.h>
+#endif
+
 #include "eina_quadtree.h"
 #include "eina_magic.h"
 #include "eina_mempool.h"