Re: bootstrap/4269: [sparc-unknown-netbsdeld1.5] HAVE_NL_LANGINFO

Re: bootstrap/4269: [sparc-unknown-netbsdeld1.5] HAVE_NL_LANGINFO

[Andrew Haley]

The following reply was made to PR bootstrap/4269; it has been noted by GNATS.

From: Andrew Haley <aph@redhat.com>
To: To:bangerth@dealii.org, gcc-patches@gcc.gnu.org,
	gcc-gnats@gcc.gnu.org
Cc: <bunk@fs.tum.de>
Subject: Re: bootstrap/4269: [sparc-unknown-netbsdeld1.5] HAVE_NL_LANGINFO
Date: Fri, 31 Jan 2003 20:53:17 GMT

 This patch looks OK, but I'll need a ChangeLog entry.
 
 Andrew.
 
 
 ---------- Forwarded message ----------
 Date: Mon, 27 Jan 2003 18:56:46 +0100
 From: Adrian Bunk <bunk@fs.tum.de>
 To: bangerth@dealii.org, gcc-bugs@gcc.gnu.org, gcc-prs@gcc.gnu.org,
      nobody@gcc.gnu.org, gcc-gnats@gcc.gnu.org
 Subject: Re: bootstrap/4269: [sparc-unknown-netbsdeld1.5] HAVE_NL_LANGINFO
     doesn't ensure that CODESET is available
 
 On Thu, Nov 21, 2002 at 02:44:28PM -0000, bangerth@dealii.org wrote:
 > Synopsis: [sparc-unknown-netbsdeld1.5] HAVE_NL_LANGINFO doesn't ensure that CODESET is available
 > 
 > State-Changed-From-To: feedback->analyzed
 > State-Changed-By: bangerth
 > State-Changed-When: Thu Nov 21 06:44:27 2002
 > State-Changed-Why:
 >     Problem still exists as of Nov 21, 2002.
 >     
 >     You already have pointed out the autoconf snippet that is
 >     necessary. Would you mind submitting a patch to 
 >     gcc-patches@gcc.gnu.org that uses it?
 
 
 In gcc head HAVE_LANGINFO_CODESET is already defined resp. undefined in 
 gcc/auto-host.h. I don't know that much about the gcc build system, 
 could you check whether the patch below looks correct?
 
 
 >     W.
 > 
 > http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view%20audit-trail&database=gcc&pr=4269
 
 cu
 Adrian
 
 
 *** gcc/java/jv-scan.c.old	Mon Jan 27 00:51:14 2003
 --- gcc/java/jv-scan.c	Mon Jan 27 00:51:34 2003
 ***************
 *** 33,39 ****
   #include <locale.h>
   #endif
   
 ! #ifdef HAVE_NL_LANGINFO
   #include <langinfo.h>
   #endif
   
 --- 33,39 ----
   #include <locale.h>
   #endif
   
 ! #ifdef HAVE_LANGINFO_CODESET
   #include <langinfo.h>
   #endif
   
 ***************
 *** 205,211 ****
   	    /* 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)
   	    setlocale (LC_CTYPE, "");
   	    if (encoding == NULL)
   	      encoding = nl_langinfo (CODESET);
 --- 205,211 ----
   	    /* 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_LANGINFO_CODESET)
   	    setlocale (LC_CTYPE, "");
   	    if (encoding == NULL)
   	      encoding = nl_langinfo (CODESET);
 *** gcc/java/jcf-parse.c.old	Mon Jan 27 00:50:17 2003
 --- gcc/java/jcf-parse.c	Mon Jan 27 00:50:46 2003
 ***************
 *** 47,53 ****
   #include <locale.h>
   #endif
   
 ! #ifdef HAVE_NL_LANGINFO
   #include <langinfo.h>
   #endif
   
 --- 47,53 ----
   #include <locale.h>
   #endif
   
 ! #ifdef HAVE_LANGINFO_CODESET
   #include <langinfo.h>
   #endif
   
 ***************
 *** 798,804 ****
     /* 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)
     setlocale (LC_CTYPE, "");
     if (current_encoding == NULL)
       current_encoding = nl_langinfo (CODESET);
 --- 798,804 ----
     /* 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_LANGINFO_CODESET)
     setlocale (LC_CTYPE, "");
     if (current_encoding == NULL)
       current_encoding = nl_langinfo (CODESET);