summaryrefslogtreecommitdiff
path: root/src/lib/ecore_file
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-20 09:10:00 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-20 09:10:00 -0400
commita5267d3d9c55ebcc2da3e7e05b23bc88d436f3fb (patch)
treea6432d852103ec270e11c156b5c514da5fe26e51 /src/lib/ecore_file
parentc567278b5473fd42af7dd7090c4dc2979cc15558 (diff)
remove Evil.h when not necessary, include evil_private.h when necessary
Test Plan: compilation Reviewers: zmike, raster, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8925
Diffstat (limited to 'src/lib/ecore_file')
-rw-r--r--src/lib/ecore_file/ecore_file.c1
-rw-r--r--src/lib/ecore_file/ecore_file_monitor_win32.c14
-rw-r--r--src/lib/ecore_file/ecore_file_private.h4
3 files changed, 9 insertions, 10 deletions
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index 4780350de0..ab8b07f1ce 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -10,6 +10,7 @@
10 10
11#ifdef _WIN32 11#ifdef _WIN32
12# include <direct.h> 12# include <direct.h>
13# include <evil_private.h> /* mkdir realpath */
13#endif 14#endif
14 15
15#ifdef HAVE_FEATURES_H 16#ifdef HAVE_FEATURES_H
diff --git a/src/lib/ecore_file/ecore_file_monitor_win32.c b/src/lib/ecore_file/ecore_file_monitor_win32.c
index 8a0f92dca7..59f5f88470 100644
--- a/src/lib/ecore_file/ecore_file_monitor_win32.c
+++ b/src/lib/ecore_file/ecore_file_monitor_win32.c
@@ -6,12 +6,14 @@
6# include <config.h> 6# include <config.h>
7#endif 7#endif
8 8
9# define WIN32_LEAN_AND_MEAN 9#define WIN32_LEAN_AND_MEAN
10# include <windows.h> 10#include <windows.h>
11# undef WIN32_LEAN_AND_MEAN 11#undef WIN32_LEAN_AND_MEAN
12# include <process.h> 12#include <process.h>
13 13
14# include "ecore_file_private.h" 14#include <evil_private.h> /* evil_wchar_to_char */
15
16#include "ecore_file_private.h"
15 17
16 18
17typedef struct _Ecore_File_Monitor_Win32 Ecore_File_Monitor_Win32; 19typedef struct _Ecore_File_Monitor_Win32 Ecore_File_Monitor_Win32;
@@ -191,7 +193,7 @@ _ecore_file_monitor_win32_cb(void *data, Ecore_Win32_Handler *wh EINA_UNUSED)
191 else 193 else
192 event = ECORE_FILE_EVENT_CREATED_FILE; 194 event = ECORE_FILE_EVENT_CREATED_FILE;
193 break; 195 break;
194 default: 196 default:
195 fprintf(stderr, "unknown event\n"); 197 fprintf(stderr, "unknown event\n");
196 event = ECORE_FILE_EVENT_NONE; 198 event = ECORE_FILE_EVENT_NONE;
197 break; 199 break;
diff --git a/src/lib/ecore_file/ecore_file_private.h b/src/lib/ecore_file/ecore_file_private.h
index 9a02fffd6d..01ea0a4f11 100644
--- a/src/lib/ecore_file/ecore_file_private.h
+++ b/src/lib/ecore_file/ecore_file_private.h
@@ -5,10 +5,6 @@
5# include <features.h> 5# include <features.h>
6#endif 6#endif
7 7
8#ifdef _WIN32
9# include <Evil.h>
10#endif
11
12#ifdef HAVE_ESCAPE 8#ifdef HAVE_ESCAPE
13# include <Escape.h> 9# include <Escape.h>
14#endif 10#endif