Skip to content

Commit 50280c1

Browse files
committed
Revert "Don't expose unavailable cstdio functions."
Broke builders that emit different diagnostics. e.g.: error: 'warning' diagnostics seen but not expected: Line 13: alias declarations are a C++11 extension Line 20: alias declarations are a C++11 extension This reverts commit ff87813.
1 parent 19fec00 commit 50280c1

File tree

5 files changed

+0
-44
lines changed

5 files changed

+0
-44
lines changed

libcxx/include/__config

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,13 +1545,6 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
15451545
#define _LIBCPP_BUILTIN_CONSTANT_P(x) false
15461546
#endif
15471547

1548-
// Support for _FILE_OFFSET_BITS=64 landed gradually in Android, so the full set
1549-
// of functions used in cstdio may not be available for low API levels when
1550-
// using 64-bit file offsets on LP32.
1551-
#if defined(__BIONIC__) && defined(__USE_FILE_OFFSET64) && __ANDROID_API__ < 24
1552-
#define _LIBCPP_HAS_NO_FGETPOS_FSETPOS
1553-
#endif
1554-
15551548
#endif // __cplusplus
15561549

15571550
#endif // _LIBCPP_CONFIG

libcxx/include/cstdio

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,9 @@ using ::putc;
131131
using ::ungetc;
132132
using ::fread;
133133
using ::fwrite;
134-
#ifndef _LIBCPP_HAS_NO_FGETPOS_FSETPOS
135134
using ::fgetpos;
136-
#endif
137135
using ::fseek;
138-
#ifndef _LIBCPP_HAS_NO_FGETPOS_FSETPOS
139136
using ::fsetpos;
140-
#endif
141137
using ::ftell;
142138
using ::rewind;
143139
using ::clearerr;

libcxx/test/libcxx/depr/depr.c.headers/no_fgetpos_fsetpos.fail.cpp

Lines changed: 0 additions & 25 deletions
This file was deleted.

libcxx/test/std/depr/depr.c.headers/stdio_h.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,9 @@ int main(int, char**)
156156
static_assert((std::is_same<decltype(ungetc(0,fp)), int>::value), "");
157157
static_assert((std::is_same<decltype(fread((void*)0,0,0,fp)), size_t>::value), "");
158158
static_assert((std::is_same<decltype(fwrite((const void*)arr,1,0,fp)), size_t>::value), "");
159-
#ifndef _LIBCPP_HAS_NO_FGETPOS_FSETPOS
160159
static_assert((std::is_same<decltype(fgetpos(fp, &fpos)), int>::value), "");
161-
#endif
162160
static_assert((std::is_same<decltype(fseek(fp, 0,0)), int>::value), "");
163-
#ifndef _LIBCPP_HAS_NO_FGETPOS_FSETPOS
164161
static_assert((std::is_same<decltype(fsetpos(fp, &fpos)), int>::value), "");
165-
#endif
166162
static_assert((std::is_same<decltype(ftell(fp)), long>::value), "");
167163
static_assert((std::is_same<decltype(rewind(fp)), void>::value), "");
168164
static_assert((std::is_same<decltype(clearerr(fp)), void>::value), "");

libcxx/test/std/input.output/file.streams/c.files/cstdio.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,9 @@ int main(int, char**)
120120
static_assert((std::is_same<decltype(std::ungetc(0,fp)), int>::value), "");
121121
static_assert((std::is_same<decltype(std::fread((void*)0,0,0,fp)), std::size_t>::value), "");
122122
static_assert((std::is_same<decltype(std::fwrite((const void*)0,0,0,fp)), std::size_t>::value), "");
123-
#ifndef _LIBCPP_HAS_NO_FGETPOS_FSETPOS
124123
static_assert((std::is_same<decltype(std::fgetpos(fp, &fpos)), int>::value), "");
125-
#endif
126124
static_assert((std::is_same<decltype(std::fseek(fp, 0,0)), int>::value), "");
127-
#ifndef _LIBCPP_HAS_NO_FGETPOS_FSETPOS
128125
static_assert((std::is_same<decltype(std::fsetpos(fp, &fpos)), int>::value), "");
129-
#endif
130126
static_assert((std::is_same<decltype(std::ftell(fp)), long>::value), "");
131127
static_assert((std::is_same<decltype(std::rewind(fp)), void>::value), "");
132128
static_assert((std::is_same<decltype(std::clearerr(fp)), void>::value), "");

0 commit comments

Comments
 (0)