Skip to content

Commit ecefbbd

Browse files
committed
Reinstate __cplusplus conditional
1 parent 4a3bcba commit ecefbbd

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

system/lib/libc/musl/arch/emscripten/bits/alltypes.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
#define __BYTE_ORDER 1234
1010
#define __LONG_MAX __LONG_MAX__
1111

12+
#ifndef __cplusplus
1213
#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
1314
typedef __WCHAR_TYPE__ wchar_t;
1415
#define __DEFINED_wchar_t
1516
#endif
1617

18+
#endif
1719
#if defined(__NEED_wint_t) && !defined(__DEFINED_wint_t)
1820
typedef __WINT_TYPE__ wint_t;
1921
#define __DEFINED_wint_t

system/lib/libc/musl/arch/emscripten/bits/alltypes.h.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
#define __BYTE_ORDER 1234
1010
#define __LONG_MAX __LONG_MAX__
1111

12+
#ifndef __cplusplus
1213
TYPEDEF __WCHAR_TYPE__ wchar_t;
14+
#endif
1315
TYPEDEF __WINT_TYPE__ wint_t;
1416

1517
// XXX EMSCRIPTEN: ensure it's always 32-bits even in wasm64

0 commit comments

Comments
 (0)