From 3915235c6a4b5b3bc7a9b83a7e05930eab8c305b Mon Sep 17 00:00:00 2001
From: raster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Fri, 7 Jan 2011 15:56:54 +0000
Subject: [PATCH] hve to revert these commits. they hve created a whole chunk
 of 64bit crashes on linux. this is REALLY bad. so remove these changes now.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@55981 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 configure.ac                    |  2 +-
 src/lib/ecore/ecore.c           |  3 +--
 src/lib/ecore/ecore_app.c       |  6 ++----
 src/lib/ecore/ecore_main.c      | 17 ++++++-----------
 src/lib/ecore_file/ecore_file.c |  6 +-----
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index f4cc314..df8d9a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -889,7 +889,7 @@ case "$host_os" in
       have_addrinfo="yes"
       ;;
    *)
-      AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h sys/time.h sys/mman.h signal.h sys/resource.h sys/param.h unistd.h libgen])
+      AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h sys/time.h sys/mman.h signal.h sys/resource.h])
       ;;
 esac
 
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 9a1c30c..ff17209 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
 #endif
 
@@ -27,7 +27,6 @@
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
-
 #include <Eina.h>
 
 #include "Ecore.h"
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index 9ee05b1..fe47d81 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -4,11 +4,9 @@
 
 #include <stdlib.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
-#endif
-
-#ifdef _MSC_VER
+#else
 # include <process.h>
 #endif
 
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index b268612..479beb5 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -23,22 +23,17 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#ifdef HAVE_SYS_TIME_H
+#ifndef _MSC_VER
 # include <sys/time.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
 # include <unistd.h>
-#endif
-
-#ifdef _MSC_VER
+#else
 # include <float.h>
 #endif
 
 #define FIX_HZ 1
 
 #ifdef FIX_HZ
-# ifdef HAVE_SYS_PARAM_H
+# ifndef _MSC_VER
 #  include <sys/param.h>
 # endif
 # ifndef HZ
@@ -50,6 +45,9 @@
 # include <Evil.h>
 #endif
 
+#include "Ecore.h"
+#include "ecore_private.h"
+
 #ifdef HAVE_SYS_EPOLL_H
 # define HAVE_EPOLL
 # include <sys/epoll.h>
@@ -59,9 +57,6 @@
 # include <glib.h>
 #endif
 
-#include "Ecore.h"
-#include "ecore_private.h"
-
 struct _Ecore_Fd_Handler
 {
    EINA_INLIST;
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index 82c1aa2..7fff284 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -5,18 +5,14 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
-#endif
-
-#ifdef HAVE_LIBGEN_H
 # include <libgen.h>
 #endif
 
 #ifdef HAVE_FEATURES_H
 # include <features.h>
 #endif
-
 #include <ctype.h>
 #include <errno.h>
 
-- 
2.7.4