You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2006/06/09 22:50:02 UTC
svn commit: r413162 - /incubator/stdcxx/trunk/include/ansi/cwchar
Author: sebor
Date: Fri Jun 9 13:50:02 2006
New Revision: 413162
URL: http://svn.apache.org/viewvc?rev=413162&view=rev
Log:
2006-06-09 Martin Sebor <se...@roguewave.com>
* cwchar (swprintf, vswprintf): Declared extern "C++" for MSVC 7.1
and beyond.
Modified:
incubator/stdcxx/trunk/include/ansi/cwchar
Modified: incubator/stdcxx/trunk/include/ansi/cwchar
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/ansi/cwchar?rev=413162&r1=413161&r2=413162&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/ansi/cwchar (original)
+++ incubator/stdcxx/trunk/include/ansi/cwchar Fri Jun 9 13:50:02 2006
@@ -308,8 +308,17 @@
} // namespace std
+#if _MSC_VER < 1310 // MSVC < 7.1 or (better yet) not MSVC
+
extern "C" int swprintf (wchar_t*, size_t, const wchar_t*, ...);
+#else // MSVC 7.1 and above
+
+// MSVC 7.1 declares two overloads of swprintf()
+extern "C++" int swprintf (wchar_t*, size_t, const wchar_t*, ...);
+
+#endif // MSVC
+
namespace std {
using ::swprintf;
@@ -368,7 +377,16 @@
} // namespace std
+#if _MSC_VER < 1310 // MSVC < 7.1 or (better yet) not MSVC
+
extern "C" int vswprintf (wchar_t*, size_t, const wchar_t*, _RWSTD_VA_LIST);
+
+#else // MSVC 7.1 and above
+
+// MSVC 7.1 declares two overloads of vswprintf()
+extern "C++" int vswprintf (wchar_t*, size_t, const wchar_t*, _RWSTD_VA_LIST);
+
+#endif // MSVC
namespace std {