From 67ce5e1c1f3aca6d06531459dce03b552fc7f4b3 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Fri, 15 Apr 2005 01:22:46 +0000
Subject: [PATCH] move evas to private - it should be removed entirely though
 :) c++ thingies...

SVN revision: 14205
---
 legacy/ecore/src/lib/ecore/Ecore.h            |  8 +-
 legacy/ecore/src/lib/ecore_file/Ecore_File.h  | 87 ++++++++++---------
 .../src/lib/ecore_file/ecore_file_private.h   |  3 +
 3 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h
index bd74b5bd16..308262d677 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/legacy/ecore/src/lib/ecore/Ecore.h
@@ -54,6 +54,10 @@
 
 #include <Ecore_Data.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -66,10 +70,6 @@
 #define PATH_MAX 4096
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef MIN
 #define MIN(x, y) (((x) > (y)) ? (y) : (x))
 #endif
diff --git a/legacy/ecore/src/lib/ecore_file/Ecore_File.h b/legacy/ecore/src/lib/ecore_file/Ecore_File.h
index b9b0b7f294..12c8646eda 100644
--- a/legacy/ecore/src/lib/ecore_file/Ecore_File.h
+++ b/legacy/ecore/src/lib/ecore_file/Ecore_File.h
@@ -26,46 +26,53 @@
 # endif
 #endif
 
-#include <Evas.h>
 #include <time.h>
 
-EAPI int        ecore_file_init     (void);
-EAPI int        ecore_file_shutdown (void);
-EAPI time_t     ecore_file_mod_time (const char *file);
-EAPI int        ecore_file_exists   (const char *file);
-EAPI int        ecore_file_is_dir   (const char *file);
-EAPI int        ecore_file_mkdir    (const char *dir);
-EAPI int        ecore_file_mkpath   (const char *path);
-EAPI int        ecore_file_cp       (const char *src, const char *dst);
-EAPI char      *ecore_file_realpath (const char *file);
-EAPI char      *ecore_file_get_file (char *path);
-EAPI char      *ecore_file_get_dir  (char *path);
-
-EAPI int        ecore_file_can_exec (const char *file);
-EAPI char      *ecore_file_readlink (const char *link);
-EAPI Ecore_List *ecore_file_ls       (const char *dir);
-
-typedef struct _Ecore_File_Monitor       Ecore_File_Monitor;
-typedef struct _Ecore_File_Monitor_Event Ecore_File_Monitor_Event;
-
-typedef enum {
-     ECORE_FILE_EVENT_NONE,
-     ECORE_FILE_EVENT_CREATED_FILE,
-     ECORE_FILE_EVENT_CREATED_DIRECTORY,
-     ECORE_FILE_EVENT_DELETED_FILE,
-     ECORE_FILE_EVENT_DELETED_DIRECTORY,
-     ECORE_FILE_EVENT_DELETED_SELF,
-     ECORE_FILE_EVENT_MODIFIED
-} Ecore_File_Event;
-
-EAPI Ecore_File_Monitor *ecore_file_monitor_add(const char *path,
-						void (*func) (void *data,
-							      Ecore_File_Monitor *ecore_file_monitor,
-							      Ecore_File_Event event,
-							      const char *path),
-					       	void *data);
-EAPI void                ecore_file_monitor_del(Ecore_File_Monitor *ecore_file_monitor);
-EAPI const char         *ecore_file_monitor_path_get(Ecore_File_Monitor *ecore_file_monitor);
-
-
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+   typedef struct _Ecore_File_Monitor       Ecore_File_Monitor;
+   typedef struct _Ecore_File_Monitor_Event Ecore_File_Monitor_Event;
+   
+   typedef enum
+     {
+	ECORE_FILE_EVENT_NONE,
+	  ECORE_FILE_EVENT_CREATED_FILE,
+	  ECORE_FILE_EVENT_CREATED_DIRECTORY,
+	  ECORE_FILE_EVENT_DELETED_FILE,
+	  ECORE_FILE_EVENT_DELETED_DIRECTORY,
+	  ECORE_FILE_EVENT_DELETED_SELF,
+	  ECORE_FILE_EVENT_MODIFIED
+     } Ecore_File_Event;
+   
+   
+   EAPI int        ecore_file_init     (void);
+   EAPI int        ecore_file_shutdown (void);
+   EAPI time_t     ecore_file_mod_time (const char *file);
+   EAPI int        ecore_file_exists   (const char *file);
+   EAPI int        ecore_file_is_dir   (const char *file);
+   EAPI int        ecore_file_mkdir    (const char *dir);
+   EAPI int        ecore_file_mkpath   (const char *path);
+   EAPI int        ecore_file_cp       (const char *src, const char *dst);
+   EAPI char      *ecore_file_realpath (const char *file);
+   EAPI char      *ecore_file_get_file (char *path);
+   EAPI char      *ecore_file_get_dir  (char *path);
+   
+   EAPI int        ecore_file_can_exec (const char *file);
+   EAPI char      *ecore_file_readlink (const char *link);
+   EAPI Ecore_List *ecore_file_ls      (const char *dir);
+   
+   EAPI Ecore_File_Monitor *ecore_file_monitor_add(const char *path,
+						   void (*func) (void *data,
+								 Ecore_File_Monitor *ecore_file_monitor,
+								 Ecore_File_Event event,
+								 const char *path),
+						   void *data);
+   EAPI void        ecore_file_monitor_del(Ecore_File_Monitor *ecore_file_monitor);
+   EAPI const char *ecore_file_monitor_path_get(Ecore_File_Monitor *ecore_file_monitor);
+   
+#ifdef __cplusplus
+}
+#endif
 #endif
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
index 5559c743fb..d58184a81e 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
@@ -4,6 +4,9 @@
 #include <stdio.h>
 #include <string.h>
 
+/* FIXME: ecore_file's internals shouldnt use evas imho */
+#include <Evas.h>
+
 #include "config.h"
 
 #include "Ecore.h"