re PR java/5080 (gcc/java/jcf-parse.c:908: `LC_CTYPE' undeclared (first use in this function))

2002-02-01  Craig Rodrigues  <rodrigc@gcc.gnu.org>

        PR java/5080
        * jcf-parse.c : Check for HAVE_LOCALE_H before using
        setlocale() with LC_CTYPE as a parameter.
        * jv-scan.c: Same.

From-SVN: r49410

gcc/java/ChangeLog

+2002-02-01  Craig Rodrigues  <rodrigc@gcc.gnu.org>
+
+	PR java/5080
+	* jcf-parse.c : Check for HAVE_LOCALE_H before using
+	setlocale() with LC_CTYPE as a parameter.
+	* jv-scan.c: Same.
+
 2002-01-31  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* gjavah.c (version), jcf-dump.c (version), jv-scan.c (version):

gcc/java/jcf-parse.c

@@ -911,13 +911,11 @@ parse_source_file_1 (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.  */
-#ifdef HAVE_ICONV
-#ifdef HAVE_NL_LANGINFO
+#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_NL_LANGINFO)
   setlocale (LC_CTYPE, "");
   if (current_encoding == NULL)
     current_encoding = nl_langinfo (CODESET);
-#endif /* HAVE_NL_LANGINFO */
-#endif /* HAVE_ICONV */
+#endif 
   if (current_encoding == NULL || *current_encoding == '\0')
     current_encoding = DEFAULT_ENCODING;
 

gcc/java/jv-scan.c

@@ -199,13 +199,11 @@ DEFUN (main, (argc, 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.  */
-#ifdef HAVE_ICONV
-#ifdef HAVE_NL_LANGINFO
+#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_NL_LANGINFO)
 	    setlocale (LC_CTYPE, "");
 	    if (encoding == NULL)
 	      encoding = nl_langinfo (CODESET);
-#endif /* HAVE_NL_LANGINFO */
-#endif /* HAVE_ICONV */
+#endif  
 	    if (encoding == NULL || *encoding == '\0')
 	      encoding = DEFAULT_ENCODING;