FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natPlainDatagramSocketImpl.cc (NATIVE_CLOSE): New define.

Browse source 
2002-08-27  Tony Kimball <alk@pobox.com>
            Tom Tromey  <tromey@redhat.com>

	* 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 <tromey@redhat.com>

From-SVN: r56605
This commit is contained in:
Tony Kimball 2002-08-27 16:08:31 +00:00 • committed by Tom Tromey
parent 8632ed40b6
commit 835cb22e3b
4 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libjava/ChangeLog
View file

@ -1,3 +1,15 @@
2002-08-27 Tony Kimball <alk@pobox.com>
Tom Tromey <tromey@redhat.com>
* 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.
2002-08-25 Adam Megacz <adam@xwt.org> 2002-08-25 Adam Megacz <adam@xwt.org>
* include/win32.h (getcwd): copied function declaration as * include/win32.h (getcwd): copied function declaration as

3
libjava/include/win32.h
View file

@ -19,8 +19,7 @@ details. */
#include <gcj/cni.h> #include <gcj/cni.h>
#include <java/util/Properties.h> #include <java/util/Properties.h>
// FIXME: remove this once the io.h issue is resolved #include <io.h>
extern "C" char* getcwd (char*, int);
extern void _Jv_platform_initialize (void); extern void _Jv_platform_initialize (void);
extern void _Jv_platform_initProperties (java::util::Properties*); extern void _Jv_platform_initProperties (java::util::Properties*);

12
libjava/java/net/natPlainDatagramSocketImpl.cc
View file

@ -17,13 +17,10 @@ details. */
#define ENOPROTOOPT 109 #define ENOPROTOOPT 109
#endif #endif
static inline int #define NATIVE_CLOSE(s) closesocket (s)
close(int s)
{
return closesocket(s);
}
#else /* WIN32 */ #else /* WIN32 */
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
@ -35,6 +32,9 @@ close(int s)
#endif #endif
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#define NATIVE_CLOSE(s) ::close (s)
#endif /* WIN32 */ #endif /* WIN32 */
#if HAVE_BSTRING_H #if HAVE_BSTRING_H
@ -303,7 +303,7 @@ java::net::PlainDatagramSocketImpl::close ()
// The method isn't declared to throw anything, so we disregard // The method isn't declared to throw anything, so we disregard
// the return value. // the return value.
::close (fnum); NATIVE_CLOSE (fnum);
fnum = -1; fnum = -1;
timeout = 0; timeout = 0;
} }

12
libjava/java/net/natPlainSocketImpl.cc
View file

@ -20,13 +20,9 @@ details. */
#undef MIN_PRIORITY #undef MIN_PRIORITY
#undef FIONREAD #undef FIONREAD
// These functions make the Win32 socket API look more POSIXy #define NATIVE_CLOSE(s) closesocket (s)
static inline int
close(int s)
{
return closesocket(s);
}
// These functions make the Win32 socket API look more POSIXy
static inline int static inline int
write(int s, void *buf, int len) write(int s, void *buf, int len)
{ {
@ -63,6 +59,8 @@ read(int s, void *buf, int len)
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#define NATIVE_CLOSE(s) ::close (s)
#endif /* WIN32 */ #endif /* WIN32 */
#endif /* DISABLE_JAVA_NET */ #endif /* DISABLE_JAVA_NET */
@ -429,7 +427,7 @@ java::net::PlainSocketImpl::close()
JvSynchronize sync (this); JvSynchronize sync (this);
// should we use shutdown here? how would that effect so_linger? // should we use shutdown here? how would that effect so_linger?
int res = ::close (fnum); int res = NATIVE_CLOSE (fnum);
if (res == -1) if (res == -1)
{ {