head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2
	RELEASE_9_0_0:1.2
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	PRE_XORG_7:1.2
	RELEASE_4_EOL:1.2
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.2
	RELEASE_5_5_0:1.2
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.2
	RELEASE_4_10_0:1.2;
locks; strict;
comment	@# @;


1.2
date	2004.03.17.14.00.02;	author netchild;	state Exp;
branches;
next	1.1;

1.1
date	2004.01.11.15.32.07;	author netchild;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 8.0.058.p061.

This version fixes the stlport test cases (heap corruption due to
inlining and exception handling).
@
text
@--- include/c++/cwchar.orig	Wed Mar 17 14:30:53 2004
+++ include/c++/cwchar	Wed Mar 17 14:33:12 2004
@@@@ -9,27 +9,12 @@@@
   #include <wchar.h>
  #define _STD_USING
 
-#ifndef __QNX__
-typedef mbstate_t _Mbstatet;
-#endif /* __QNX__ */
-
 #else /* _STD_USING */
  #include <wchar.h>
 
-#ifndef WCHAR_MAX
- #define WCHAR_MAX	0x7fff
-#endif /* WCHAR_MAX */
-
-#ifndef WCHAR_MIN
- #define WCHAR_MIN	0
-#endif /* WCHAR_MIN */
-
-
-typedef mbstate_t _Mbstatet;
-
  #ifdef _GLOBAL_USING
 _STD_BEGIN
-using _CSTD mbstate_t; using _CSTD size_t; using _CSTD tm; using _CSTD wint_t;
+using _CSTD mbstate_t; using _CSTD size_t; /* using _CSTD tm; */ using _CSTD wint_t;
 
 #if __GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
 using _CSTD fgetwc; using _CSTD fgetws; using _CSTD fputwc;
@@@@ -37,20 +22,20 @@@@
 using _CSTD putwc; using _CSTD putwchar; using _CSTD ungetwc;
 #endif
 
-using _CSTD btowc;
-using _CSTD mbrlen; using _CSTD mbrtowc; using _CSTD mbsrtowcs;
-using _CSTD mbsinit;
-using _CSTD wcrtomb;
-using _CSTD wcsrtombs; using _CSTD wcstol; using _CSTD wcscat;
-using _CSTD wcschr; using _CSTD wcscmp; using _CSTD wcscoll;
+// using _CSTD btowc;
+// using _CSTD mbrlen; using _CSTD mbrtowc; using _CSTD mbsrtowcs;
+// using _CSTD mbsinit;
+// using _CSTD wcrtomb;
+/* using _CSTD wcsrtombs; using _CSTD wcstol; */ using _CSTD wcscat;
+using _CSTD wcschr; using _CSTD wcscmp; // using _CSTD wcscoll;
 using _CSTD wcscpy; using _CSTD wcscspn; using _CSTD wcslen;
 using _CSTD wcsncat; using _CSTD wcsncmp; using _CSTD wcsncpy;
 using _CSTD wcspbrk; using _CSTD wcsrchr; using _CSTD wcsspn;
-using _CSTD wcstod; using _CSTD wcstoul; using _CSTD wcsstr;
-using _CSTD wcstok; using _CSTD wcsxfrm; using _CSTD wctob;
+/* using _CSTD wcstod; using _CSTD wcstoul; */ using _CSTD wcsstr;
+// using _CSTD wcstok; using _CSTD wcsxfrm; using _CSTD wctob;
 using _CSTD wmemchr; using _CSTD wmemcmp; using _CSTD wmemcpy;
 using _CSTD wmemmove; using _CSTD wmemset;
-using _CSTD wcsftime;
+// using _CSTD wcsftime;
 
 #ifdef __USE_ISOC99
 using _CSTD fwide; using _CSTD fwprintf;
@


1.1
log
@Update to 8.0.055.p057.

As Intel uses it's own directory for ifc and icc, we don't conflict with
ifc anymore.

Because of ABI changes, you have to recompile C++ programs (don't forget
stlport-icc).

Note that this port is a _work in progress_:
 - Icc allows to use an already installed libstdc++ from gcc, this doesn't
   work yet on FreeBSD. Libstdc++ on 4.x is too old, so it's unlikely we
   can add support for it. The headers of libstdc++ shipping with FreeBSD
   5.2-CURRENT use GCCisms not (yet) supported by icc, the hardcoded search
   path for them also doesn't fit for FreeBSD 5.2-CURRENT.
 - We've incorporated parts (cxa) of the FreeBSD >= 502101 libc on < 502101
   systems. It's tested on 4.x, but not on FreeBSD < 502101.
 - Not all (new) options (including GCC compatibility) are thoroughly
   tested.

When encountering problems please report to me first instead of directly
contacting Intel.

Ackknowledgements:
 - Bradley T Hughes <bhughes@@trolltech.com> for PR 59552, it resulted in
   a modification of our libc (C++ DSO Object Destruction API) we
   incorporate in the port on < 502101 systems.
 - Marius Strobl <marius@@alchemy.franken.de> for his help with the port
   (e.g. ld.c, cxa).
@
text
@d1 3
a3 3
--- include/c++/cwchar.orig	Sat Dec 13 19:41:14 2003
+++ include/c++/cwchar	Sat Dec 13 19:42:25 2003
@@@@ -9,25 +9,12 @@@@
d7 1
d9 1
d32 1
a32 1
@@@@ -35,20 +22,20 @@@@
@

