From 2830a8186adc5a2adcf27a7a7986f98bd6006f33 Mon Sep 17 00:00:00 2001 From: doursse Date: Sat, 7 Jun 2008 06:38:54 +0000 Subject: [PATCH] * src/lib/Evil.h: include windows.h instead of windef.h undefine PATH_MATH before defining it * src/lib/dlfcn/dlfcn.c: remove useless header file SVN revision: 34763 --- legacy/evil/ChangeLog | 9 +++++++++ legacy/evil/src/lib/Evil.h | 8 +++++++- legacy/evil/src/lib/dlfcn/dlfcn.c | 4 ---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog index 140f031ee3..4b4c123d34 100644 --- a/legacy/evil/ChangeLog +++ b/legacy/evil/ChangeLog @@ -1,3 +1,12 @@ +2008-06-07 Vincent Torri + + * src/lib/Evil.h: + include windows.h instead of windef.h + undefine PATH_MATH before defining it + + * src/lib/dlfcn/dlfcn.c: + remove useless header file + 2008-06-06 Vincent Torri * src/lib/Evil.h: diff --git a/legacy/evil/src/lib/Evil.h b/legacy/evil/src/lib/Evil.h index b7b77b175b..fffecea267 100644 --- a/legacy/evil/src/lib/Evil.h +++ b/legacy/evil/src/lib/Evil.h @@ -22,7 +22,13 @@ extern "C" { #endif -#include +#define WIN32_LEAN_AND_MEAN +#include +#undef WIN32_LEAN_AND_MEAN + +#ifdef PATH_MAX +# undef PATH_MAX +#endif /* PATH_MAX */ #define PATH_MAX MAX_PATH diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.c b/legacy/evil/src/lib/dlfcn/dlfcn.c index 6e5962d79d..c18b8e25e2 100644 --- a/legacy/evil/src/lib/dlfcn/dlfcn.c +++ b/legacy/evil/src/lib/dlfcn/dlfcn.c @@ -1,9 +1,5 @@ #include -#define WIN32_LEAN_AND_MEAN -#include -#undef WIN32_LEAN_AND_MEAN - #if defined(__CEGCC__) || defined(__MINGW32CE__) # include #endif /* __MINGW32CE__ */