From 43ed37904a72d3ad0ffc6e27711e2537d9312d02 Mon Sep 17 00:00:00 2001 From: doursse Date: Wed, 5 Mar 2008 11:22:46 +0000 Subject: [PATCH] * src/lib/Evil.h: * src/lib/evil.c: cegcc or mingwce32 does not like relative path, so _fullpath or other similar function do not exist on Winodws mobile. * src/lib/mman/mman.c: missing # SVN revision: 33935 --- legacy/evil/ChangeLog | 11 +++++++++++ legacy/evil/src/lib/Evil.h | 4 +++- legacy/evil/src/lib/evil.c | 6 ++++-- legacy/evil/src/lib/mman/mman.c | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog index 4119796ab4..e1a4c02452 100644 --- a/legacy/evil/ChangeLog +++ b/legacy/evil/ChangeLog @@ -1,3 +1,14 @@ +2008-03-05 Vincent Torri + + * src/lib/Evil.h: + * src/lib/evil.c: + cegcc or mingwce32 does not like relative path, + so _fullpath or other similar function do not exist + on Winodws mobile. + + * src/lib/mman/mman.c: + missing # + 2008-03-05 Vincent Torri fix compilation with cegcc and minor fixing diff --git a/legacy/evil/src/lib/Evil.h b/legacy/evil/src/lib/Evil.h index 9fa36c5e96..74b6419ba9 100644 --- a/legacy/evil/src/lib/Evil.h +++ b/legacy/evil/src/lib/Evil.h @@ -291,8 +291,9 @@ EAPI int pipe(int *fds); # endif #endif +#if ! ( defined(__CEGCC__) || defined(__MINGW32CE__) ) /** - * @brief Return aan absolute or full path name for a specified relative path name. + * @brief Return an absolute or full path name for a specified relative path name. * * @param file_name The absolute path name. * @param resolved_name The relative path name. @@ -316,6 +317,7 @@ EAPI int pipe(int *fds); * @ingroup Evil */ EAPI char *realpath(const char *file_name, char *resolved_name); +#endif /* ! __CEGCC__ && ! __MINGW32CE__ */ /** * @brief Initiates the use of Windows sockets. diff --git a/legacy/evil/src/lib/evil.c b/legacy/evil/src/lib/evil.c index ae4d7085b6..26362c454c 100644 --- a/legacy/evil/src/lib/evil.c +++ b/legacy/evil/src/lib/evil.c @@ -1,9 +1,9 @@ -#include - #define WIN32_LEAN_AND_MEAN #include #undef WIN32_LEAN_AND_MEAN +#include + #ifndef __CEGCC__ # include # include @@ -345,11 +345,13 @@ pipe(int *fds) #endif /* ! __CEGCC__ */ +#if ! ( defined(__CEGCC__) || defined(__MINGW32CE__) ) char * realpath(const char *file_name, char *resolved_name) { return _fullpath(resolved_name, file_name, PATH_MAX); } +#endif /* ! __CEGCC__ && ! __MINGW32CE__ */ int evil_sockets_init(void) diff --git a/legacy/evil/src/lib/mman/mman.c b/legacy/evil/src/lib/mman/mman.c index a211214cf7..c1c0bcc0dd 100644 --- a/legacy/evil/src/lib/mman/mman.c +++ b/legacy/evil/src/lib/mman/mman.c @@ -23,7 +23,7 @@ #if defined(__CEGCC__) # define CreateFileMapping CreateFileMappingW # define _get_osfhandle get_osfhandle -elif defined (__MINGW32CE__) +# elif defined (__MINGW32CE__) # define _get_osfhandle(FILEDES) ((long)FILEDES) #endif /* ! __CEGCC__ && ! __MINGW32CE__ */