This is the mail archive of the java-patches@sourceware.cygnus.com mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

SunOS4 doesn't have sys/socket.h...


... but it was being included unconditionally.

I'm installing this patch in the branch only; the problem is already
fixed in mainline.

Index: libjava/ChangeLog
from  Alexandre Oliva  <oliva@dcc.unicamp.br>
	* java/net/natPlainDatagramSocketImpl.cc: Include sys/select.h
	only when configure finds it.
	* java/net/natPlainSocketImpl.cc: Likewise.
	
Index: libjava/java/net/natPlainDatagramSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainDatagramSocketImpl.cc,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 natPlainDatagramSocketImpl.cc
--- libjava/java/net/natPlainDatagramSocketImpl.cc	1999/08/01 23:33:03	1.5.2.1
+++ libjava/java/net/natPlainDatagramSocketImpl.cc	1999/08/21 12:05:40
@@ -11,7 +11,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
 #include <netinet/in.h>
 #include <errno.h>
 #include <stdio.h>
Index: libjava/java/net/natPlainSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainSocketImpl.cc,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 natPlainSocketImpl.cc
--- libjava/java/net/natPlainSocketImpl.cc	1999/08/01 23:33:03	1.6.2.1
+++ libjava/java/net/natPlainSocketImpl.cc	1999/08/21 12:05:40
@@ -11,7 +11,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <errno.h>

-- 
Alexandre Oliva http://www.dcc.unicamp.br/~oliva IC-Unicamp, Bra[sz]il
oliva@{dcc.unicamp.br,guarana.{org,com}} aoliva@{acm.org,computer.org}
oliva@{gnu.org,kaffe.org,{egcs,sourceware}.cygnus.com,samba.org}
** I may forward mail about projects to mailing lists; please use them

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]