From 130e63de4a0cb4495036ddfe79b3207b8c1f1b38 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sun, 1 Aug 1999 23:39:53 +0000 Subject: [PATCH] configure.in: Check for bstring.h. 1999-08-01 Alexandre Oliva * configure.in: Check for bstring.h. * configure, include/config.h.in: Rebuilt. * java/net/natPlainDatagramSocketImpl.cc: #include bstring.h. * java/net/natPlainSocketImpl.cc: Likewise. From-SVN: r28378 --- libjava/ChangeLog | 7 +++++++ libjava/configure | 2 +- libjava/configure.in | 2 +- libjava/include/config.h.in | 3 +++ libjava/java/net/natPlainDatagramSocketImpl.cc | 5 +++++ libjava/java/net/natPlainSocketImpl.cc | 5 +++++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3bfe6885c85..2a2a9e2e9a5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +1999-08-01 Alexandre Oliva + + * configure.in: Check for bstring.h. + * configure, include/config.h.in: Rebuilt. + * java/net/natPlainDatagramSocketImpl.cc: #include bstring.h. + * java/net/natPlainSocketImpl.cc: Likewise. + 1999-07-31 Tom Tromey * NEWS: Likewise. diff --git a/libjava/configure b/libjava/configure index e0af1c841b5..e474168619d 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4527,7 +4527,7 @@ EOF -for ac_hdr in 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 +for ac_hdr in 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 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff --git a/libjava/configure.in b/libjava/configure.in index 0d62de63926..af7a6e42a85 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -505,7 +505,7 @@ AC_SUBST(AM_RUNTESTFLAGS) 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) diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index bd43c75905b..d9b9a0a9cf8 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -214,6 +214,9 @@ /* Define if you have the header file. */ #undef HAVE_ARPA_INET_H +/* Define if you have the header file. */ +#undef HAVE_BSTRING_H + /* Define if you have the header file. */ #undef HAVE_DIRENT_H diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 9474eb2045f..ec08d20a64a 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -28,6 +28,11 @@ details. */ #include #include +#if HAVE_BSTRING_H +// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 +#include +#endif + #include #include #include diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index a41a68157c8..2e7f9d5c558 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -18,6 +18,11 @@ details. */ #include #include +#if HAVE_BSTRING_H +// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 +#include +#endif + #include #include #include -- 2.30.2