Patch: locale.h

Tom Tromey tromey@redhat.com
Thu Jan 11 09:48:00 GMT 2001


This fixes a recently reported build problem on Solaris 7.

I'll check this in once I've finished rebuilding.

2001-01-11  Tom Tromey  <tromey@redhat.com>

	* java/lang/natSystem.cc: Include locale.h if it exists.
	* configure: Rebuilt.
	* configure.in: Check for locale.h.

Tom

Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/libjava/configure.in,v
retrieving revision 1.71
diff -u -r1.71 configure.in
--- configure.in	2000/12/11 04:37:14	1.71
+++ configure.in	2001/01/11 17:42:06
@@ -660,7 +660,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 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 langinfo.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 langinfo.h locale.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: java/lang/natSystem.cc
===================================================================
RCS file: /cvs/gcc/egcs/libjava/java/lang/natSystem.cc,v
retrieving revision 1.32
diff -u -r1.32 natSystem.cc
--- natSystem.cc	2001/01/09 07:07:51	1.32
+++ natSystem.cc	2001/01/11 17:42:07
@@ -25,6 +25,10 @@
 #include <sys/utsname.h>
 #endif
 
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif


More information about the Java-patches mailing list