diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-04 18:17:30 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-04 18:17:30 +0000 |
| commit | b369eea79f5ef06a8b314e5ef3a25a0db36db410 (patch) | |
| tree | 58de3c1b8ae13b2a2fc07f00c015c90a308ccd86 /wince | |
| parent | d80285a9fe71b2e5474c66614d48ad03f0d17d6b (diff) | |
* file.c (utimbuf): use utimbuf instead of _utimbuf if defined _WIN32.
* win32/Makefile.sub (LIBS): use oldnames.lib.
* win32/win32.c (rb_w32_getcwd): follow above change.
* win32/win32.h: ditto.
* wince/direct.c, wince/direct.h (getcwd): ditto.
* wince/io.h: ditto.
* wince/string.c, wince/wince.h (stricmp, strnicmp): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'wince')
| -rw-r--r-- | wince/direct.c | 2 | ||||
| -rw-r--r-- | wince/direct.h | 3 | ||||
| -rw-r--r-- | wince/io.h | 3 | ||||
| -rw-r--r-- | wince/string.c | 6 | ||||
| -rw-r--r-- | wince/wince.h | 10 |
5 files changed, 12 insertions, 12 deletions
diff --git a/wince/direct.c b/wince/direct.c index 6cffc40e3e..4e1ff7a866 100644 --- a/wince/direct.c +++ b/wince/direct.c @@ -11,7 +11,7 @@ static char _currentdir[MAX_PATH+1]; -char *_getcwd(char* buffer, int maxlen) +char *getcwd(char* buffer, int maxlen) { strcpy( buffer, _currentdir ); return buffer; diff --git a/wince/direct.h b/wince/direct.h index 6122a4483a..7c859b9d3b 100644 --- a/wince/direct.h +++ b/wince/direct.h @@ -6,7 +6,7 @@ extern "C" { #endif -char *_getcwd(char* buffer, int maxlen); +char *getcwd(char* buffer, int maxlen); int _chdir(const char * dirname); int _rmdir(const char * dir); int _mkdir(const char * dir); @@ -15,7 +15,6 @@ int _mkdir(const char * dir); }; #endif -#define getcwd _getcwd #define chdir _chdir #define rmdir _rmdir #define mkdir _mkdir diff --git a/wince/io.h b/wince/io.h index 46c4a849c3..5f80599bda 100644 --- a/wince/io.h +++ b/wince/io.h @@ -49,6 +49,7 @@ int _findclose( long handle ); }; #endif +#define chmod _chmod #define chsize _chsize #define rename _rename #define unlink _unlink @@ -61,6 +62,8 @@ int _findclose( long handle ); #define isatty _isatty #define access _access #define pipe _pipe +#define setmode _setmode +#define lseek _lseek #endif diff --git a/wince/string.c b/wince/string.c index eb95d94d47..74a4afe909 100644 --- a/wince/string.c +++ b/wince/string.c @@ -23,8 +23,8 @@ char* strerror(int errno) return rb_w32_strerror(errno); } -/* _strnicmp already exists in stdlib.h? */ -int _strnicmp( const char *s1, const char *s2, size_t count ) +/* strnicmp already exists in stdlib.h? */ +int strnicmp( const char *s1, const char *s2, size_t count ) { wchar_t *w1, *w2; int n; @@ -53,7 +53,7 @@ char *strrchr( const char *p, int c ) return pp==p ? NULL : pp; } -int _stricmp( const char *s1, const char *s2 ) +int stricmp( const char *s1, const char *s2 ) { wchar_t *w1, *w2; int n; diff --git a/wince/wince.h b/wince/wince.h index 2d3d89aa76..4081042718 100644 --- a/wince/wince.h +++ b/wince/wince.h @@ -57,10 +57,8 @@ extern "C" { /* Win32 API redifinition. */ #ifdef GetCommandLine - #undef GetCommandLine - #define GetCommandLine GetCommandLineA -#else - #define GetCommandLine GetCommandLineA +#undef GetCommandLine +#define GetCommandLine GetCommandLineA #endif #ifdef SetFileAttributes @@ -141,7 +139,7 @@ char *_fullpath(char *absPath, const char *relPath, size_t maxLength); /* string.c */ char *strdup(const char * str); /* char *strerror(int errno); */ -int _strnicmp( const char *s1, const char *s2, size_t count ); +int strnicmp( const char *s1, const char *s2, size_t count ); #define strnicmp _strnicmp @@ -192,7 +190,7 @@ void wce_FreeCommandLine(void); #if _WIN32_WCE < 300 /* for Handheld PC Pro. */ char *strrchr( const char *p, int c ); - int _stricmp( const char *p1, const char *p2 ); + int stricmp( const char *p1, const char *p2 ); VOID ZeroMemory(PVOID p, DWORD length); #define isascii(c) ( (c>=0x00&&c<=0x7f)?1:0 ) |