summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-10-04 21:37:30 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-10-04 21:37:30 +0000
commitcad3b359a4b7ed494081971fe05887133570997d (patch)
treece8aed4d1ac77cd5db9d7082bf198f5969415772 /libjava
parent567b6c3b07f286013ab0288ab2e830f13696d1ba (diff)
downloadgcc-cad3b359a4b7ed494081971fe05887133570997d.tar.gz
* java/net/natPlainSocketImpl.cc: Don't include headers if
java.net is disabled. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29812 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-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 8c44cf9e17c..7511376afc0 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 df98fef14b8..62dafd32cdd 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