Skip to content

Commit 1e337b1

Browse files
committed
[libc++] Revert "[SystemZ][z/OS] Missing wchar functions libc++"
This reverts commit febbf68 because it added files that were not under the LLVM license. See https://reviews.llvm.org/D98207 for details.
1 parent b7aae9f commit 1e337b1

File tree

4 files changed

+3
-167
lines changed

4 files changed

+3
-167
lines changed

libcxx/include/wchar.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD
170170
}
171171
#endif
172172

173-
#if defined(__cplusplus) && (defined(_LIBCPP_MSVCRT_LIKE) || defined(__MVS__))
173+
#if defined(__cplusplus) && defined(_LIBCPP_MSVCRT_LIKE)
174174
extern "C" {
175175
size_t mbsnrtowcs(wchar_t *__restrict dst, const char **__restrict src,
176176
size_t nmc, size_t len, mbstate_t *__restrict ps);
177177
size_t wcsnrtombs(char *__restrict dst, const wchar_t **__restrict src,
178178
size_t nwc, size_t len, mbstate_t *__restrict ps);
179-
} // extern "C"
180-
#endif // __cplusplus && (_LIBCPP_MSVCRT || __MVS__)
179+
} // extern "C++"
180+
#endif // __cplusplus && _LIBCPP_MSVCRT
181181

182182
#endif // _LIBCPP_WCHAR_H

libcxx/src/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
9292
)
9393
elseif(ZOS)
9494
list(APPEND LIBCXX_SOURCES
95-
support/ibm/mbsnrtowcs.inc
96-
support/ibm/wcsnrtombs.inc
9795
support/ibm/xlocale_zos.cpp
9896
)
9997
endif()

libcxx/src/support/ibm/mbsnrtowcs.inc

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

libcxx/src/support/ibm/wcsnrtombs.inc

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

0 commit comments

Comments
 (0)