Commit 60678e47 by Bryce McKinlay Committed by Bryce McKinlay

posix.h: Add multiple include header protection.

	* include/posix.h: Add multiple include header protection.
	* java/net/natPlainSocketImpl.cc: Don't #include <posix.h>.

From-SVN: r50559
parent 72da3c3e
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> 2002-03-10 Adam Megacz <adam@xwt.org>
* java/net/natPlainSocketImpl.cc: Added #include <platform.h>. * java/net/natPlainSocketImpl.cc: Added #include <platform.h>.
......
...@@ -8,6 +8,9 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,6 +8,9 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#ifndef __JV_POSIX_H__
#define __JV_POSIX_H__
/* Required on Tru64 UNIX V4/V5 so <sys/socket.h> defines prototypes of /* 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 socket functions with socklen_t instead of size_t. This must be defined
early so <standards.h> defines the correct version of __PIIX. */ early so <standards.h> defines the correct version of __PIIX. */
...@@ -42,3 +45,5 @@ _Jv_platform_close_on_exec (jint fd) ...@@ -42,3 +45,5 @@ _Jv_platform_close_on_exec (jint fd)
// Ignore errors. // Ignore errors.
fcntl (fd, F_SETFD, FD_CLOEXEC); fcntl (fd, F_SETFD, FD_CLOEXEC);
} }
#endif
...@@ -45,7 +45,6 @@ read(int s, void *buf, int len) ...@@ -45,7 +45,6 @@ read(int s, void *buf, int len)
#define ENOPROTOOPT 109 #define ENOPROTOOPT 109
#endif #endif
#else /* WIN32 */ #else /* WIN32 */
#include "posix.h"
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment