From 49c85058af832dce0ea0cbc389945f45459bb43c Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 29 Jul 2003 03:17:13 +0000 Subject: * ChangeLog: tabify. * ext/etc/etc.c: add real prototype to getenv(). * win32/win32.h: add arguments to definitions of functions if possible. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.h | 112 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 55 insertions(+), 57 deletions(-) (limited to 'win32') diff --git a/win32/win32.h b/win32/win32.h index 976e8f36f4..d04ea376e6 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -93,35 +93,32 @@ extern "C++" { #define fputchar(_c) putchar(_c) #define utime(_p, _t) rb_w32_utime(_p, _t) -#define strcasecmp stricmp -#define strncasecmp strnicmp -#ifdef __BORLANDC__ -#define _open _sopen -#endif +#define strcasecmp(s1, s2) stricmp(s1, s2) +#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) -#define close rb_w32_close -#define fclose rb_w32_fclose -#define getpid rb_w32_getpid -#define sleep(x) rb_w32_sleep((x)*1000) +#define close(h) rb_w32_close(h) +#define fclose(f) rb_w32_fclose(f) +#define getpid() rb_w32_getpid() +#define sleep(x) rb_w32_sleep((x)*1000) #ifdef __BORLANDC__ -#define creat _creat -#define eof _eof -#define filelength _filelength -#define locking _locking -#define mktemp _mktemp -#define perror _perror -#define read _read -#define sopen _sopen -#define tell _tell -#define umask _umask -#define unlink _unlink -#define write _write -#endif -#define vsnprintf _vsnprintf -#define snprintf _snprintf -#define fsync _commit +#define creat(p, m) _creat(p, m) +#define eof() _eof() +#define filelength(h) _filelength(h) +#define mktemp(t) _mktemp(t) +#define perror(s) _perror(s) +#define read(h, b, l) _read(h, b, l) +#define tell(h) _tell(h) +#define umask(m) _umask(m) +#define unlink(p) _unlink(p) +#define write(h, b, l) _write(h, b, l) +#define _open _sopen +#define sopen _sopen +#endif +#define vsnprintf _vsnprintf +#define snprintf _snprintf +#define fsync(h) _commit(h) #undef stat -#define stat(path,st) rb_w32_stat(path,st) +#define stat(path,st) rb_w32_stat(path,st) #ifdef __MINGW32__ struct timezone { @@ -280,144 +277,144 @@ extern char *rb_w32_strerror(int); #ifdef accept #undef accept #endif -#define accept rb_w32_accept +#define accept(s, a, l) rb_w32_accept(s, a, l) #ifdef bind #undef bind #endif -#define bind rb_w32_bind +#define bind(s, a, l) rb_w32_bind(s, a, l) #ifdef connect #undef connect #endif -#define connect rb_w32_connect +#define connect(s, a, l) rb_w32_connect(s, a, l) #undef FD_SET -#define FD_SET rb_w32_fdset +#define FD_SET(f, s) rb_w32_fdset(f, s) #undef FD_CLR -#define FD_CLR rb_w32_fdclr +#define FD_CLR(f, s) rb_w32_fdclr(f, s) #undef FD_ISSET -#define FD_ISSET rb_w32_fdisset +#define FD_ISSET(f, s) rb_w32_fdisset(f, s) #undef select -#define select rb_w32_select +#define select(n, r, w, e, t) rb_w32_select(n, r, w, e, t) #ifdef getpeername #undef getpeername #endif -#define getpeername rb_w32_getpeername +#define getpeername(s, a, l) rb_w32_getpeername(s, a, l) #ifdef getsockname #undef getsockname #endif -#define getsockname rb_w32_getsockname +#define getsockname(s, a, l) rb_w32_getsockname(s, a, l) #ifdef getsockopt #undef getsockopt #endif -#define getsockopt rb_w32_getsockopt +#define getsockopt(s, v, n, o, l) rb_w32_getsockopt(s, v, n, o, l) #ifdef ioctlsocket #undef ioctlsocket #endif -#define ioctlsocket rb_w32_ioctlsocket +#define ioctlsocket(s, c, a) rb_w32_ioctlsocket(s, c, a) #ifdef listen #undef listen #endif -#define listen rb_w32_listen +#define listen(s, b) rb_w32_listen(s, b) #ifdef recv #undef recv #endif -#define recv rb_w32_recv +#define recv(s, b, l, f) rb_w32_recv(s, b, l, f) #ifdef recvfrom #undef recvfrom #endif -#define recvfrom rb_w32_recvfrom +#define recvfrom(s, b, l, f, fr, frl) rb_w32_recvfrom(s, b, l, f, fr, frl) #ifdef send #undef send #endif -#define send rb_w32_send +#define send(s, b, l, f) rb_w32_send(s, b, l, f) #ifdef sendto #undef sendto #endif -#define sendto rb_w32_sendto +#define sendto(s, b, l, f, t, tl) rb_w32_sendto(s, b, l, f, t, tl) #ifdef setsockopt #undef setsockopt #endif -#define setsockopt rb_w32_setsockopt +#define setsockopt(s, v, n, o, l) rb_w32_setsockopt(s, v, n, o, l) #ifdef shutdown #undef shutdown #endif -#define shutdown rb_w32_shutdown +#define shutdown(s, h) rb_w32_shutdown(s, h) #ifdef socket #undef socket #endif -#define socket rb_w32_socket +#define socket(s, t, p) rb_w32_socket(s, t, p) #ifdef gethostbyaddr #undef gethostbyaddr #endif -#define gethostbyaddr rb_w32_gethostbyaddr +#define gethostbyaddr(a, l, t) rb_w32_gethostbyaddr(a, l, t) #ifdef gethostbyname #undef gethostbyname #endif -#define gethostbyname rb_w32_gethostbyname +#define gethostbyname(n) rb_w32_gethostbyname(n) #ifdef gethostname #undef gethostname #endif -#define gethostname rb_w32_gethostname +#define gethostname(n, l) rb_w32_gethostname(n, l) #ifdef getprotobyname #undef getprotobyname #endif -#define getprotobyname rb_w32_getprotobyname +#define getprotobyname(n) rb_w32_getprotobyname(n) #ifdef getprotobynumber #undef getprotobynumber #endif -#define getprotobynumber rb_w32_getprotobynumber +#define getprotobynumber(n) rb_w32_getprotobynumber(n) #ifdef getservbyname #undef getservbyname #endif -#define getservbyname rb_w32_getservbyname +#define getservbyname(n, p) rb_w32_getservbyname(n, p) #ifdef getservbyport #undef getservbyport #endif -#define getservbyport rb_w32_getservbyport +#define getservbyport(p, pr) rb_w32_getservbyport(p, pr) #ifdef get_osfhandle #undef get_osfhandle #endif -#define get_osfhandle rb_w32_get_osfhandle +#define get_osfhandle(h) rb_w32_get_osfhandle(h) #ifdef getcwd #undef getcwd #endif -#define getcwd rb_w32_getcwd +#define getcwd(b, s) rb_w32_getcwd(b, s) #ifdef getenv #undef getenv #endif -#define getenv rb_w32_getenv +#define getenv(n) rb_w32_getenv(n) #ifdef rename #undef rename #endif -#define rename rb_w32_rename +#define rename(o, n) rb_w32_rename(o, n) struct tms { long tms_utime; @@ -429,7 +426,8 @@ struct tms { #ifdef times #undef times #endif -#define times rb_w32_times +#define times(t) rb_w32_times(t) +int rb_w32_times(struct tms *); /* thread stuff */ HANDLE GetCurrentThreadHandle(void); -- cgit v1.2.3