From stdcxx-commits-return-1519-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Mon Jul 09 16:42:51 2007 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 21690 invoked from network); 9 Jul 2007 16:42:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Jul 2007 16:42:48 -0000 Received: (qmail 6828 invoked by uid 500); 9 Jul 2007 16:42:51 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 6816 invoked by uid 500); 9 Jul 2007 16:42:51 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 6805 invoked by uid 99); 9 Jul 2007 16:42:51 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2007 09:42:51 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2007 09:42:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8A33A1A981A; Mon, 9 Jul 2007 09:42:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r554699 - /incubator/stdcxx/trunk/include/ansi/wchar.h Date: Mon, 09 Jul 2007 16:42:27 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070709164227.8A33A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebor Date: Mon Jul 9 09:42:25 2007 New Revision: 554699 URL: http://svn.apache.org/viewvc?view=rev&rev=554699 Log: 2007-07-09 Martin Sebor * wchar.h (swprintf): Avoided declaring function for MSVC 8 so as not to cause a collision with the compiler's own horribly hacked up declaration. Modified: incubator/stdcxx/trunk/include/ansi/wchar.h Modified: incubator/stdcxx/trunk/include/ansi/wchar.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/ansi/wchar.h?view=diff&rev=554699&r1=554698&r2=554699 ============================================================================== --- incubator/stdcxx/trunk/include/ansi/wchar.h (original) +++ incubator/stdcxx/trunk/include/ansi/wchar.h Mon Jul 9 09:42:25 2007 @@ -228,7 +228,13 @@ # endif // _RWSTD_NO_FWSCANF && !_RWSTD_NO_FWSCANF_IN_LIBC # if defined (_RWSTD_NO_SWPRINTF) && !defined (_RWSTD_NO_SWPRINTF_IN_LIBC) +# if !defined (_MSC_VER) || _MSC_VER < 1400 + +// disabled for MSVC 8.0 and beyond to avoid running into its awful +// declaration hackery int swprintf (wchar_t*, const wchar_t*, ...); + +# endif // !MSVC || MSVC < 8.0 # undef _RWSTD_NO_SWPRINTF # endif // _RWSTD_NO_SWPRINTF && !_RWSTD_NO_SWPRINTF_IN_LIBC