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]

IRIX 5.2 needs <bstring.h> for FD_ZERO


bzero is used in the FD_ZERO macro, and only bstring.h declares it.
Patch follows.  This is probably the last before the release, even
though the build doesn't complete without -fpermissive on SunOS 4.1.3,
and there are still some portability glitches on IRIX 5.2.  BTW, what
is the release number going to be, 2.95?

Index: libjava/ChangeLog
from  Alexandre Oliva  <oliva@dcc.unicamp.br>

	* configure.in: Check for bstring.h.
	* configure, include/config.h.in: Rebuilt.
	* java/net/natPlainDatagramSocketImpl.cc: #include bstring.h.
	* java/net/natPlainSocketImpl.cc: Likewise.
	
Index: libjava/configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.11.2.4
diff -u -r1.11.2.4 configure.in
--- libjava/configure.in	1999/08/01 00:13:59	1.11.2.4
+++ libjava/configure.in	1999/08/01 00:59:33
@@ -505,7 +505,7 @@
 dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
 dnl On that system, sys/ioctl.h will not include sys/filio.h unless
 dnl BSD_COMP is defined; just including sys/filio.h is simpler.
-AC_CHECK_HEADERS(unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h inttypes.h stdint.h)
+AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h inttypes.h stdint.h)
 dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h
 dnl for now.  If you change this, you also must update natFile.cc.
 AC_CHECK_HEADERS(dirent.h)
Index: libjava/java/net/natPlainDatagramSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainDatagramSocketImpl.cc,v
retrieving revision 1.5
diff -u -r1.5 natPlainDatagramSocketImpl.cc
--- libjava/java/net/natPlainDatagramSocketImpl.cc	1999/06/23 12:24:50	1.5
+++ libjava/java/net/natPlainDatagramSocketImpl.cc	1999/08/01 00:59:33
@@ -17,6 +17,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#if HAVE_BSTRING_H
+// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 
+#include <bstring.h>
+#endif
+
 #include <cni.h>
 #include <java/io/IOException.h>
 #include <java/io/FileDescriptor.h>
Index: libjava/java/net/natPlainSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainSocketImpl.cc,v
retrieving revision 1.6
diff -u -r1.6 natPlainSocketImpl.cc
--- libjava/java/net/natPlainSocketImpl.cc	1999/06/17 00:21:26	1.6
+++ libjava/java/net/natPlainSocketImpl.cc	1999/08/01 00:59:33
@@ -18,6 +18,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#if HAVE_BSTRING_H
+// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 
+#include <bstring.h>
+#endif
+
 #include <cni.h>
 #include <javaprims.h>
 #include <java/io/IOException.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]