From: pavenis AT lanet DOT lv
To: Andris Pavenis <pavenis AT latnet DOT lv>, djgpp-workers AT delorie DOT com
Date: Mon, 12 Mar 2001 16:01:13 +0200
MIME-Version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Subject: Re: Small DJGPP related patch for libstdc++-v3
Cc: gcc-patches AT gcc DOT gnu DOT org
Message-ID: <3AACF2C9.11813.151CF6@localhost>
In-reply-to: <01031215013300.26095@hal>
X-mailer: Pegasus Mail for Win32 (v3.12c)
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

On 12 Mar 2001, at 15:01, Andris Pavenis wrote:

> When builing libstdc++-v3/src/locale.cc some DJGPP related internal variables are incorrectly
> assumed to be in std:: namespace.  This patch should fix that: 
> 

Sorry I missed one additional typo in this file. See updated patch below

Andris

--- gcc/libstdc++-v3/config/os/djgpp/bits/ctype_noninline.h~2	Tue Mar  6 01:03:34 2001
+++ gcc/libstdc++-v3/config/os/djgpp/bits/ctype_noninline.h	Mon Mar 12 15:21:14 2001
@@ -34,10 +34,12 @@
 // Information as gleaned from DJGPP <ctype.h>
 
 // DJGPP specific code
-extern unsigned short __dj_type_cflags[];
+extern "C" {
+extern unsigned short __dj_ctype_flags[];
 extern unsigned char __dj_ctype_toupper[];
 extern unsigned char __dj_ctype_tolower[];
-  
+}  
+
   ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
 	size_t __refs = 0) 
     : __ctype_abstract_base<char>(__refs), 
@@ -45,7 +47,7 @@
       _M_toupper(__dj_ctype_toupper), 
       _M_tolower(__dj_ctype_tolower),
       _M_ctable(NULL), 
-      _M_table(__table == 0 ? __dj_type_cflags : __table) 
+      _M_table(__table == 0 ? __dj_ctype_flags : __table) 
     { }
 
   char