[libcxx] r219140 - Fix win32 support header for mingw32.

Dan Albert danalbert at google.com
Mon Oct 6 13:06:34 PDT 2014


Author: danalbert
Date: Mon Oct  6 15:06:33 2014
New Revision: 219140

URL: http://llvm.org/viewvc/llvm-project?rev=219140&view=rev
Log:
Fix win32 support header for mingw32.

These functions are defined as static in the mingw32 headers.

Modified:
    libcxx/trunk/include/support/win32/support.h

Modified: libcxx/trunk/include/support/win32/support.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/support/win32/support.h?rev=219140&r1=219139&r2=219140&view=diff
==============================================================================
--- libcxx/trunk/include/support/win32/support.h (original)
+++ libcxx/trunk/include/support/win32/support.h Mon Oct  6 15:06:33 2014
@@ -31,6 +31,8 @@
 #define NOMINMAX
 #endif
 
+// The mingw headers already define these as static.
+#ifndef __MINGW32__
 extern "C" {
 
 int vasprintf(char **sptr, const char *__restrict fmt, va_list ap);
@@ -40,6 +42,7 @@ size_t mbsnrtowcs(wchar_t *__restrict ds
 size_t wcsnrtombs(char *__restrict dst, const wchar_t **__restrict src,
                   size_t nwc, size_t len, mbstate_t *__restrict ps);
 }
+#endif // __MINGW32__
 
 #if defined(_LIBCPP_MSVCRT)
 #define snprintf _snprintf





More information about the cfe-commits mailing list