diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2000-03-15 22:03:19 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-03-15 22:03:19 +0000 |
| commit | 878885b41142dd76e858b1f705bd31f357a5acc5 (patch) | |
| tree | 6ff411e4ce4a6ce8717905d98f2d63b7479a6539 /libjava/java/net | |
| parent | 1a7b4c697c6ea7b132db9fdb84d3c9ff97c48e19 (diff) | |
| download | gcc-878885b41142dd76e858b1f705bd31f357a5acc5.zip gcc-878885b41142dd76e858b1f705bd31f357a5acc5.tar.gz gcc-878885b41142dd76e858b1f705bd31f357a5acc5.tar.bz2 | |
[multiple changes]
2000-03-15 Tom Tromey <tromey@cygnus.com>
* java/io/natFileDescriptorWin32.cc (winerr): Now static.
* prims.cc (win32_exception_handler): Reformatted.
* include/win32-threads.h (_Jv_HaveCondDestroy): New define.
(_Jv_HaveMutexDestroy): Likewise.
2000-03-15 Jon Beniston <jb7216@bristol.ac.uk>
* java/io/natFileDescriptorWin32.cc: New file.
* java/io/natFileWin32.cc: New file.
* java/net/natInetAddress.cc: Added conditional inclusion of
Windows / Winsock headers.
* java/net/natPlainDatagramSocketImpl.cc: Added conditional
inclusion of Windows / Winsock headers.
* java/net/natPlainSocketImpl.cc: Added conditional inclusion of
Windows / Winsock headers.
* include/win32-signal.h: New file.
* include/win32-threads.h: New file.
* win32-threads.cc: New file.
* exception.cc (win32_get_restart_frame): New function.
* prims.cc (win32_exception_handler): New function.
(main_init) Performs Winsock initialisation.
(main_init) Installs exeception handler.
From-SVN: r32567
Diffstat (limited to 'libjava/java/net')
| -rw-r--r-- | libjava/java/net/natInetAddress.cc | 13 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 10 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 11 |
3 files changed, 34 insertions, 0 deletions
diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc index f7a4b44..a25e643 100644 --- a/libjava/java/net/natInetAddress.cc +++ b/libjava/java/net/natInetAddress.cc @@ -14,6 +14,17 @@ details. */ # define _REENTRANT 1 #endif +#ifdef USE_WINSOCK + +#include <windows.h> +#include <winsock.h> + +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 64 +#endif /* MAXHOSTNAMELEN */ + +#else + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -35,6 +46,8 @@ details. */ #include <netdb.h> #endif +#endif /* USE_WINSOCK */ + #include <gcj/cni.h> #include <jvm.h> #include <java/net/InetAddress.h> diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index dfa13dc..94383f8 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -8,6 +8,15 @@ details. */ #include <config.h> +#ifdef USE_WINSOCK +#include <windows.h> +#include <winsock.h> +#include <errno.h> +#include <string.h> +#ifndef ENOPROTOOPT +#define ENOPROTOOPT 109 +#endif +#else /* USE_WINSOCK */ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -26,6 +35,7 @@ details. */ #endif #include <errno.h> #include <string.h> +#endif /* USE_WINSOCK */ #if HAVE_BSTRING_H // Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 459ad7e..5218746 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -8,7 +8,17 @@ details. */ #include <config.h> + #ifndef DISABLE_JAVA_NET +#ifdef USE_WINSOCK +#include <windows.h> +#include <winsock.h> +#include <errno.h> +#include <string.h> +#ifndef ENOPROTOOPT +#define ENOPROTOOPT 109 +#endif +#else /* USE_WINSOCK */ #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> @@ -19,6 +29,7 @@ details. */ #include <netinet/tcp.h> #include <errno.h> #include <string.h> +#endif /* USE_WINSOCK */ #endif /* DISABLE_JAVA_NET */ #if HAVE_BSTRING_H |