diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/include/posix.h | 5 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 80f2eda464f..3554f1a0e28 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-03-10 Bryce McKinlay <bryce@waitaki.otago.ac.nz> + + * include/posix.h: Add multiple include header protection. + * java/net/natPlainSocketImpl.cc: Don't #include <posix.h>. + 2002-03-10 Adam Megacz <adam@xwt.org> * java/net/natPlainSocketImpl.cc: Added #include <platform.h>. diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 05c6ddfad4c..7e9aaf54d92 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -8,6 +8,9 @@ This software is copyrighted work licensed under the terms of the Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ +#ifndef __JV_POSIX_H__ +#define __JV_POSIX_H__ + /* Required on Tru64 UNIX V4/V5 so <sys/socket.h> defines prototypes of socket functions with socklen_t instead of size_t. This must be defined early so <standards.h> defines the correct version of __PIIX. */ @@ -42,3 +45,5 @@ _Jv_platform_close_on_exec (jint fd) // Ignore errors. fcntl (fd, F_SETFD, FD_CLOEXEC); } + +#endif diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 855965132b5..aecbd4e2ee7 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -45,7 +45,6 @@ read(int s, void *buf, int len) #define ENOPROTOOPT 109 #endif #else /* WIN32 */ -#include "posix.h" #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> |