From 2f97aab6eae5b3afcfd614433633ed1e47166650 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 23 Jan 2018 18:53:33 +0000 Subject: libcxx: Rename vasprintf function to __libcpp_vasprintf. The language standard does not define a function with this name, so it is part of the user's namespace. This change fixes a duplicate symbol error that occurs when a user attempts to define a function with this name. Differential Revision: https://reviews.llvm.org/D42405 llvm-svn: 323237 --- libcxx/src/support/win32/locale_win32.cpp | 4 +++- libcxx/src/support/win32/support.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'libcxx/src') diff --git a/libcxx/src/support/win32/locale_win32.cpp b/libcxx/src/support/win32/locale_win32.cpp index fdca7efff06..cad9d4e8146 100644 --- a/libcxx/src/support/win32/locale_win32.cpp +++ b/libcxx/src/support/win32/locale_win32.cpp @@ -13,6 +13,8 @@ #include #include +int __libcpp_vasprintf(char **sptr, const char *__restrict fmt, va_list ap); + using std::__libcpp_locale_guard; // FIXME: base currently unused. Needs manual work to construct the new locale @@ -105,7 +107,7 @@ int asprintf_l( char **ret, locale_t loc, const char *format, ... ) int vasprintf_l( char **ret, locale_t loc, const char *format, va_list ap ) { __libcpp_locale_guard __current(loc); - return vasprintf( ret, format, ap ); + return __libcpp_vasprintf( ret, format, ap ); } #if !defined(_LIBCPP_MSVCRT) diff --git a/libcxx/src/support/win32/support.cpp b/libcxx/src/support/win32/support.cpp index dbd1c4c418a..aa636fba50b 100644 --- a/libcxx/src/support/win32/support.cpp +++ b/libcxx/src/support/win32/support.cpp @@ -19,7 +19,7 @@ // Like sprintf, but when return value >= 0 it returns // a pointer to a malloc'd string in *sptr. // If return >= 0, use free to delete *sptr. -int vasprintf( char **sptr, const char *__restrict format, va_list ap ) +int __libcpp_vasprintf( char **sptr, const char *__restrict format, va_list ap ) { *sptr = NULL; // Query the count required. -- cgit v1.2.3