From 835cb22e3bb779908a8d418137d1ff35bc432c2c Mon Sep 17 00:00:00 2001 From: Tony Kimball Date: Tue, 27 Aug 2002 16:08:31 +0000 Subject: natPlainDatagramSocketImpl.cc (NATIVE_CLOSE): New define. 2002-08-27 Tony Kimball Tom Tromey * java/net/natPlainDatagramSocketImpl.cc (NATIVE_CLOSE): New define. (::close): Removed. (PlainDatagramSocketImpl::close): Use NATIVE_CLOSE. * java/net/natPlainSocketImpl.cc (NATIVE_CLOSE): New define. (::close): Removed. (PlainSocketImpl::close): Use NATIVE_CLOSE. * include/win32.h (getcwd): Removed declaration. Include io.h. Co-Authored-By: Tom Tromey From-SVN: r56605 --- libjava/java/net/natPlainDatagramSocketImpl.cc | 12 ++++++------ libjava/java/net/natPlainSocketImpl.cc | 12 +++++------- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 2375bdb..e581f08 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -17,13 +17,10 @@ details. */ #define ENOPROTOOPT 109 #endif -static inline int -close(int s) -{ - return closesocket(s); -} +#define NATIVE_CLOSE(s) closesocket (s) #else /* WIN32 */ + #ifdef HAVE_SYS_SOCKET_H #include #endif @@ -35,6 +32,9 @@ close(int s) #endif #include #include + +#define NATIVE_CLOSE(s) ::close (s) + #endif /* WIN32 */ #if HAVE_BSTRING_H @@ -303,7 +303,7 @@ java::net::PlainDatagramSocketImpl::close () // The method isn't declared to throw anything, so we disregard // the return value. - ::close (fnum); + NATIVE_CLOSE (fnum); fnum = -1; timeout = 0; } diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 4a75e98..370c994 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -20,13 +20,9 @@ details. */ #undef MIN_PRIORITY #undef FIONREAD -// These functions make the Win32 socket API look more POSIXy -static inline int -close(int s) -{ - return closesocket(s); -} +#define NATIVE_CLOSE(s) closesocket (s) +// These functions make the Win32 socket API look more POSIXy static inline int write(int s, void *buf, int len) { @@ -63,6 +59,8 @@ read(int s, void *buf, int len) #include #include +#define NATIVE_CLOSE(s) ::close (s) + #endif /* WIN32 */ #endif /* DISABLE_JAVA_NET */ @@ -429,7 +427,7 @@ java::net::PlainSocketImpl::close() JvSynchronize sync (this); // should we use shutdown here? how would that effect so_linger? - int res = ::close (fnum); + int res = NATIVE_CLOSE (fnum); if (res == -1) { -- cgit v1.1