From 37a7adcd808a298301abea9d2b8d532e3b47c3d0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 1 Aug 1999 23:33:03 +0000 Subject: [PATCH] [multiple changes] Sun Aug 1 16:29:25 1999 Tom Tromey * Makefile.in: Rebuilt. * Makefile.am (AM_CXXFLAGS): Added -fpermissive. 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: r28377 --- libjava/ChangeLog | 12 ++++++++++++ libjava/Makefile.am | 3 ++- libjava/Makefile.in | 2 +- 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 +++++ 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d54f278eac1e..d9672d00ec33 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +Sun Aug 1 16:29:25 1999 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (AM_CXXFLAGS): Added -fpermissive. + +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/Makefile.am b/libjava/Makefile.am index e152cf5b9cbb..dc638d1aeaf3 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -67,7 +67,8 @@ JAVAC = $(GCJ) -C EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ WARNINGS = -W -Wall -AM_CXXFLAGS = -fno-rtti -fvtable-thunks @LIBGCJ_CXXFLAGS@ $(WARNINGS) +## Need -fpermissive for SunOS. FIXME. +AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fpermissive @LIBGCJ_CXXFLAGS@ $(WARNINGS) if USING_GCC AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS) else diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 3cc75ed1c217..fb54b57f7da9 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -148,7 +148,7 @@ JAVAC = $(GCJ) -C EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ WARNINGS = -W -Wall -AM_CXXFLAGS = -fno-rtti -fvtable-thunks @LIBGCJ_CXXFLAGS@ $(WARNINGS) +AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fpermissive @LIBGCJ_CXXFLAGS@ $(WARNINGS) @USING_GCC_TRUE@AM_CFLAGS = \ @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS) @USING_GCC_FALSE@AM_CFLAGS = \ diff --git a/libjava/configure b/libjava/configure index 5ac3fcc5cd05..286b2b2a7a33 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4524,7 +4524,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 611f16b434f2..4d91d2c85c6b 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 b87f54e8edec..cbef5f162b58 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -211,6 +211,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 68259509f105..18d4c4a335c8 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -17,6 +17,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 a41a68157c8d..2e7f9d5c5581 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.47.2