From b369eea79f5ef06a8b314e5ef3a25a0db36db410 Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 4 Jan 2003 18:17:30 +0000 Subject: * 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 --- win32/Makefile.sub | 2 +- win32/win32.c | 4 ---- win32/win32.h | 40 +++++----------------------------------- 3 files changed, 6 insertions(+), 40 deletions(-) (limited to 'win32') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 12a475c180..ca41c9d7bc 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -92,7 +92,7 @@ RFLAGS = -r !if !defined(EXTLIBS) EXTLIBS = !endif -LIBS = user32.lib advapi32.lib wsock32.lib $(EXTLIBS) +LIBS = oldnames.lib user32.lib advapi32.lib wsock32.lib $(EXTLIBS) MISSING = acosh.obj crypt.obj win32.obj isinf.obj isnan.obj ARFLAGS = -machine:$(MACHINE) -out: diff --git a/win32/win32.c b/win32/win32.c index 4b7035b56d..d9c9cf3624 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2398,12 +2398,8 @@ rb_w32_getcwd(buffer, size) int length; char *bp; -#ifdef __BORLANDC__ #undef getcwd if (getcwd(buffer, size) == NULL) { -#else - if (_getcwd(buffer, size) == NULL) { -#endif return NULL; } length = strlen(buffer); diff --git a/win32/win32.h b/win32/win32.h index 7cdf0a6319..0b7754b350 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -98,46 +98,17 @@ extern "C++" { #define fgetchar() getchar() #define fputchar(_c) putchar(_c) -#ifndef __BORLANDC__ - -#define access _access -#define chmod _chmod -#define chsize _chsize -#define dup _dup -#define dup2 _dup2 -#define isatty _isatty -#define open _open -#define setmode _setmode -#define execl _execl -#define execle _execle -#define execlp _execlp -#define execlpe _execlpe -#define execv _execv -#define execve _execve -#define execvp _execvp -#define execvpe _execvpe -#define lseek _lseek -#define spawnl _spawnl -#define spawnle _spawnle -#define spawnlp _spawnlp -#define spawnlpe _spawnlpe -#define spawnv _spawnv -#define spawnve _spawnve -#define spawnvp _spawnvp -#define spawnvpe _spawnvpe -#if _MSC_VER < 800 -#define fileno _fileno -#endif -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#else #define strcasecmp stricmp #define strncasecmp strnicmp +#ifdef __BORLANDC__ #define _open _sopen #endif #define close rb_w32_close #define fclose rb_w32_fclose +#define getpid rb_w32_getpid +#define sleep(x) rb_w32_sleep((x)*1000) +#ifdef __BORLANDC__ #define creat _creat #define eof _eof #define filelength _filelength @@ -150,9 +121,8 @@ extern "C++" { #define umask _umask #define unlink _unlink #define write _write -#define getpid rb_w32_getpid -#define sleep(x) rb_w32_sleep((x)*1000) #define utime _utime +#endif #define vsnprintf _vsnprintf #define snprintf _snprintf #undef stat -- cgit v1.2.3