LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcxx: Rename vasprintf function to __libcpp_vasprintf.

Browse Source 
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

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@323237 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Collingbourne
2018-01-23 18:53:33 +00:00
parent c0a476159d
commit 087c5abbe4
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/stdio.h
View File

@@ -109,13 +109,6 @@ void perror(const char* s);
#ifdef __cplusplus #ifdef __cplusplus
// snprintf
#if defined(_LIBCPP_MSVCRT_LIKE)
extern "C" {
int vasprintf(char **sptr, const char *__restrict fmt, va_list ap);
}
#endif
#undef getc #undef getc
#undef putc #undef putc
#undef clearerr #undef clearerr

4
src/support/win32/locale_win32.cpp
View File

@@ -13,6 +13,8 @@
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
int __libcpp_vasprintf(char **sptr, const char *__restrict fmt, va_list ap);
using std::__libcpp_locale_guard; using std::__libcpp_locale_guard;
// FIXME: base currently unused. Needs manual work to construct the new locale // 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 ) int vasprintf_l( char **ret, locale_t loc, const char *format, va_list ap )
{ {
__libcpp_locale_guard __current(loc); __libcpp_locale_guard __current(loc);
return vasprintf( ret, format, ap ); return __libcpp_vasprintf( ret, format, ap );
} }
#if !defined(_LIBCPP_MSVCRT) #if !defined(_LIBCPP_MSVCRT)

2
src/support/win32/support.cpp
View File

@@ -19,7 +19,7 @@
// Like sprintf, but when return value >= 0 it returns // Like sprintf, but when return value >= 0 it returns
// a pointer to a malloc'd string in *sptr. // a pointer to a malloc'd string in *sptr.
// If return >= 0, use free to delete *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; *sptr = NULL;
// Query the count required. // Query the count required.