From:	Andris Pavenis <pavenis AT latnet DOT lv>
To:	Benjamin Kosnik <bkoz AT redhat DOT com>, djgpp-workers AT delorie DOT com
Subject:	Re: Small DJGPP related patch for libstdc++-v3
Date:	Tue, 13 Mar 2001 10:12:48 +0200
X-Mailer:	KMail [version 1.2]
References:	<200103122010 DOT f2CKAFP23382 AT fillmore DOT constant DOT com>
In-Reply-To:	<200103122010.f2CKAFP23382@fillmore.constant.com>
Cc:	gcc-patches AT gcc DOT gnu DOT org, libstdc++@gcc.gnu.org
MIME-Version:	1.0
Message-Id:	<01031310124800.17911@hal>
Reply-To:	djgpp-workers AT delorie DOT com

On Monday 12 March 2001 22:10, Benjamin Kosnik wrote:
> This looks wrong. These ctype bits should be declared in ctype.h as
> extern "C"--this file is included way before the file you've patched
> (ctype_noninline.h).

You're right. The real problem was with the typo I mentioned in the second 
message and presence of definition of DJGPP internal symbols in 
libstdc++-v3/config/djgpp/ctype_noninline.h (as result in std namespace 
and these definitions are getting used instead of correct ones 
from ctype.h)

Andris

2001-03-13  Andris Pavenis <pavenis AT latnet DOT lv>

	* config/djgpp/bits/ctype_noninline.h: fix typo and remove duplicate
		definitions of __dj_ctype_*

--- 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	Tue Mar 13 09:26:39 2001
@@ -34,9 +34,6 @@
 // Information as gleaned from DJGPP <ctype.h>
 
 // DJGPP specific code
-extern unsigned short __dj_type_cflags[];
-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) 
@@ -45,7 +42,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



  

- Raw text -