Fix for java/4269:

2003-01-31 Adrian Bunk <bunk@fs.tum.de>

	Fix for java/4269:

	* jv-scan.c: Use HAVE_LANGINFO_CODESET instead of HAVE_NL_LANGINFO
	to fix bootstrap on sparc-unknown-netbsdelf1.5.
	* jcf-parse.c: Likewise.

From-SVN: r62310

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index bb360c0afc05c66beb054563c4f05f73f1537631..3343824e4c8e5bf6502ef8f06f6b53016d7cccca 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-31 Adrian Bunk <bunk@fs.tum.de>
+
+       Fix for java/4269:
+
+       * jv-scan.c: Use HAVE_LANGINFO_CODESET instead of HAVE_NL_LANGINFO
+       to fix bootstrap on sparc-unknown-netbsdelf1.5.
+       * jcf-parse.c: Likewise.
+
 2003-01-31  Mark Wielaard  <mark@klomp.org>
 
        * gjavah.c (throwable_p): Allocate 1 more byte for string.

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 20dc3ff9208e21b8b5cd2b141c0e44683e3ad90b..ac4757ca20a2460a50091d025f7153d940e70340 100644 (file)
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -47,7 +47,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include <locale.h>
 #endif
 
-#ifdef HAVE_NL_LANGINFO
+#ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
 #endif
 
@@ -802,7 +802,7 @@ parse_source_file_1 (tree file, FILE *finput)
   /* There's no point in trying to find the current encoding unless we
      are going to do something intelligent with it -- hence the test
      for iconv.  */
-#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_NL_LANGINFO)
+#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_LANGINFO_CODESET)
   setlocale (LC_CTYPE, "");
   if (current_encoding == NULL)
     current_encoding = nl_langinfo (CODESET);

diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 90e16e7cec9495c885350dfcc47ced4ff8c19e4d..e1bc5729345a08f1566e0a08303acb2b5b0d2518 100644 (file)
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #include <locale.h>
 #endif
 
-#ifdef HAVE_NL_LANGINFO
+#ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
 #endif
 
@@ -205,7 +205,7 @@ main (int argc, char **argv)
            /* There's no point in trying to find the current encoding
               unless we are going to do something intelligent with it
               -- hence the test for iconv.  */
-#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_NL_LANGINFO)
+#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_LANGINFO_CODESET)
            setlocale (LC_CTYPE, "");
            if (encoding == NULL)
              encoding = nl_langinfo (CODESET);