aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog3
-rw-r--r--libjava/java/net/natPlainSocketImpl.cc2
2 files changed, 5 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8c44cf9..7511376 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
1999-10-04 Tom Tromey <tromey@cygnus.com>
+ * java/net/natPlainSocketImpl.cc: Don't include headers if
+ java.net is disabled.
+
* Makefile.in: Rebuilt.
* Makefile.am (ZINCS): Removed. This is defined in configure.in
when needed, and must be left empty when not needed.
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index df98fef..62dafd3 100644
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -8,6 +8,7 @@ details. */
#include <config.h>
+#ifndef DISABLE_JAVA_NET
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
@@ -19,6 +20,7 @@ details. */
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#endif /* DISABLE_JAVA_NET */
#if HAVE_BSTRING_H
// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2