From 03527fe2aa389e72347c7519755b66e82e04bdf4 Mon Sep 17 00:00:00 2001
From: doursse <doursse>
Date: Fri, 28 Mar 2008 17:05:16 +0000
Subject: [PATCH] * src/lib/Evil.h: remove the stat structure and add guards *
 src/lib/dlfcn/dlfcn.c: include limits.h also for the cegcc compiler

SVN revision: 34129
---
 legacy/evil/ChangeLog             |  8 ++++++++
 legacy/evil/src/lib/Evil.h        | 22 ++++++----------------
 legacy/evil/src/lib/dlfcn/dlfcn.c |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 95854f61a1..fb12ba307c 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-28  Vincent Torri  <doursse at users dot sf dot net>
+
+	* src/lib/Evil.h:
+	remove the stat structure and add guards
+
+	* src/lib/dlfcn/dlfcn.c:
+	include limits.h also for the cegcc compiler
+
 2008-03-23  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/Evil.h:
diff --git a/legacy/evil/src/lib/Evil.h b/legacy/evil/src/lib/Evil.h
index 932fd3febb..790900880a 100644
--- a/legacy/evil/src/lib/Evil.h
+++ b/legacy/evil/src/lib/Evil.h
@@ -283,22 +283,12 @@ EAPI int pipe(int *fds);
    (defined(_WIN32) && !defined(_UWIN) && !defined(__CYGWIN__) && !defined(__CEGCC__))
 # if defined(_MSC_VER) || defined(__MINGW32__)
 
-struct stat
-{
-	_dev_t	st_dev;		/* Equivalent to drive number 0=A 1=B ... */
-	_ino_t	st_ino;		/* Always zero ? */
-	_mode_t	st_mode;	/* See above constants */
-	short	st_nlink;	/* Number of links. */
-	short	st_uid;		/* User: Maybe significant on NT ? */
-	short	st_gid;		/* Group: Ditto */
-	_dev_t	st_rdev;	/* Seems useless (not even filled in) */
-	_off_t	st_size;	/* File size in bytes */
-	time_t	st_atime;	/* Accessed date (always 00:00 hrs local
-				 * on FAT) */
-	time_t	st_mtime;	/* Modified time */
-	time_t	st_ctime;	/* Creation time */
-};
-
+#  ifdef S_ISDIR
+#   undef S_ISDIR
+#  endif
+#  ifdef S_ISREG
+#   undef S_ISREG
+#  endif
 #  define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
 #  define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
 
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.c b/legacy/evil/src/lib/dlfcn/dlfcn.c
index 6459fa6e93..933d06d2af 100644
--- a/legacy/evil/src/lib/dlfcn/dlfcn.c
+++ b/legacy/evil/src/lib/dlfcn/dlfcn.c
@@ -4,7 +4,7 @@
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 
-#ifdef __MINGW32CE__
+#if defined(__CEGCC__) || defined(__MINGW32CE__)
 # include <limits.h>
 #endif /* __MINGW32CE__ */