From b5ac42942c8f8b2fb4d1feba1cd0b228a07ae952 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 20 Sep 2008 10:02:09 +0000 Subject: [PATCH] * mingw32ce has no locale stuff * libmman does not exist anymore SVN revision: 36127 --- legacy/evil/evil.pc.in | 2 +- legacy/evil/src/lib/Evil.h | 1 - legacy/evil/src/lib/evil_langinfo.c | 4 ++-- legacy/evil/src/lib/evil_langinfo.h | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/legacy/evil/evil.pc.in b/legacy/evil/evil.pc.in index b63bcef7f7..a5c2f453e9 100644 --- a/legacy/evil/evil.pc.in +++ b/legacy/evil/evil.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: evil Description: Library that ports on Windows some specific Unix functions. Version: @VERSION@ -Libs: -L${libdir} -levil -lmman -ldl +Libs: -L${libdir} -levil -ldl Libs.private: Cflags: -I${includedir} diff --git a/legacy/evil/src/lib/Evil.h b/legacy/evil/src/lib/Evil.h index 004e2daa6b..eff555b4b5 100644 --- a/legacy/evil/src/lib/Evil.h +++ b/legacy/evil/src/lib/Evil.h @@ -66,7 +66,6 @@ extern "C" { #include #include #include -#include #ifdef PATH_MAX diff --git a/legacy/evil/src/lib/evil_langinfo.c b/legacy/evil/src/lib/evil_langinfo.c index d478b0d028..3819bb9760 100644 --- a/legacy/evil/src/lib/evil_langinfo.c +++ b/legacy/evil/src/lib/evil_langinfo.c @@ -6,7 +6,7 @@ #include "Evil.h" -#ifndef __CEGCC__ +#if ! (defined(__CEGCC__) || defined(__MINGW32CE__)) static char * replace(char *prev, char *value) @@ -47,4 +47,4 @@ nl_langinfo(nl_item index) return nothing; } -#endif /* ! __CEGCC__ */ +#endif /* __CEGCC__ || __MINGW32CE__ */ diff --git a/legacy/evil/src/lib/evil_langinfo.h b/legacy/evil/src/lib/evil_langinfo.h index 6cfcaa45a7..f103ee1983 100644 --- a/legacy/evil/src/lib/evil_langinfo.h +++ b/legacy/evil/src/lib/evil_langinfo.h @@ -2,7 +2,7 @@ #define __EVIL_LANGINFO_H__ -#ifndef __CEGCC__ +#if ! (defined(__CEGCC__) || defined(__MINGW32CE__)) #include @@ -33,7 +33,7 @@ enum { EAPI char *nl_langinfo(nl_item index); -#endif /* ! __CEGCC__ */ +#endif /* __CEGCC__ || __MINGW32CE__ */ #endif /*__EVIL_LANGINFO_H__ */