aboutsummaryrefslogtreecommitdiff
path: root/system/include/libcxx/cstdio
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-01 12:55:33 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-01 12:55:33 -0700
commit8408257cd66435af849f493c10c7f0e8d1d5fa3b (patch)
tree8b05963e8608b22f71620f512679d7cd5b1de548 /system/include/libcxx/cstdio
parenta8e4801c7d38033fff760ea26a4579aa324e303e (diff)
parent36600f34ef0ec2cf75165be3753567e256f514db (diff)
Merge branch 'incoming'
Diffstat (limited to 'system/include/libcxx/cstdio')
-rw-r--r--system/include/libcxx/cstdio20
1 files changed, 18 insertions, 2 deletions
diff --git a/system/include/libcxx/cstdio b/system/include/libcxx/cstdio
index 9af0ed5e..718d2f71 100644
--- a/system/include/libcxx/cstdio
+++ b/system/include/libcxx/cstdio
@@ -99,7 +99,21 @@ void perror(const char* s);
#include <__config>
#include <stdio.h>
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
+#endif
+
+#ifdef getc
+inline _LIBCPP_INLINE_VISIBILITY int __libcpp_getc(FILE* __stream) {return getc(__stream);}
+#undef getc
+inline _LIBCPP_INLINE_VISIBILITY int getc(FILE* __stream) {return __libcpp_getc(__stream);}
+#endif // getc
+
+#ifdef putc
+inline _LIBCPP_INLINE_VISIBILITY int __libcpp_putc(int __c, FILE* __stream) {return putc(__c, __stream);}
+#undef putc
+inline _LIBCPP_INLINE_VISIBILITY int putc(int __c, FILE* __stream) {return __libcpp_putc(__c, __stream);}
+#endif // putc
_LIBCPP_BEGIN_NAMESPACE_STD
@@ -124,13 +138,15 @@ using ::scanf;
using ::snprintf;
using ::sprintf;
using ::sscanf;
+#ifndef _MSC_VER
using ::vfprintf;
using ::vfscanf;
-using ::vprintf;
using ::vscanf;
+using ::vsscanf;
+#endif // _MSC_VER
+using ::vprintf;
using ::vsnprintf;
using ::vsprintf;
-using ::vsscanf;
using ::fgetc;
using ::fgets;
using ::fputc;