am abc15f52: Remove the bionic *wscanf workarounds.
* commit 'abc15f529e75c784b2f8b47281c66b6a1b6783e7': Remove the bionic *wscanf workarounds.
This commit is contained in:
@@ -109,9 +109,6 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
|
|||||||
#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
|
#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
|
||||||
#include <support/win32/support.h> // pull in *swprintf defines
|
#include <support/win32/support.h> // pull in *swprintf defines
|
||||||
#endif // _LIBCPP_MSVCRT
|
#endif // _LIBCPP_MSVCRT
|
||||||
#ifdef __ANDROID__
|
|
||||||
#include <support/android/wchar_bionic.h>
|
|
||||||
#endif // __ANDROID__
|
|
||||||
|
|
||||||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
||||||
#pragma GCC system_header
|
#pragma GCC system_header
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
// -*- C++ -*-
|
|
||||||
//===------------------- support/android/wchar_bionic.h -------------------===//
|
|
||||||
//
|
|
||||||
// The LLVM Compiler Infrastructure
|
|
||||||
//
|
|
||||||
// This file is dual licensed under the MIT and the University of Illinois Open
|
|
||||||
// Source Licenses. See LICENSE.TXT for details.
|
|
||||||
//
|
|
||||||
//===----------------------------------------------------------------------===//
|
|
||||||
|
|
||||||
#ifndef _LIBCPP_SUPPORT_ANDROID_WCHAR_BIONIC_H
|
|
||||||
#define _LIBCPP_SUPPORT_ANDROID_WCHAR_BIONIC_H
|
|
||||||
|
|
||||||
#ifdef __ANDROID__
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int vfwscanf(FILE *, const wchar_t *, va_list);
|
|
||||||
int vswscanf(const wchar_t *, const wchar_t *, va_list);
|
|
||||||
int vwscanf(const wchar_t *, va_list);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif // __ANDROID__
|
|
||||||
#endif // _LIBCPP_SUPPORT_ANDROID_WCHAR_BIONIC_H
|
|
||||||
Reference in New Issue
Block a user