Author: vitek
Date: Fri Aug 1 14:28:56 2008
New Revision: 681841
URL: http://svn.apache.org/viewvc?rev=681841&view=rev
Log:
2008-08-01 Travis Vitek <[EMAIL PROTECTED]>
Merge r676075 from branches/4.2.x
2008-07-11 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-992
* src/wcodecvt.cpp (mblen): Declared with the correct return type.
Modified:
stdcxx/trunk/src/wcodecvt.cpp
Modified: stdcxx/trunk/src/wcodecvt.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/src/wcodecvt.cpp?rev=681841&r1=681840&r2=681841&view=diff
==============================================================================
--- stdcxx/trunk/src/wcodecvt.cpp (original)
+++ stdcxx/trunk/src/wcodecvt.cpp Fri Aug 1 14:28:56 2008
@@ -86,7 +86,7 @@
# undef _RWSTD_NO_MBLEN
-extern "C" _RWSTD_SIZE_T
+extern "C" int
mblen (const char*, size_t) _LIBC_THROWS();
#endif // _RWSTD_NO_MBLEN && !_RWSTD_NO_MBLEN_IN_LIBC