Skip to content

Commit 6058ffa

Browse files
committed
fix Fuchsia changes after merge
1 parent d0fe0e6 commit 6058ffa

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

stdlib/public/SwiftShims/LibcShims.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ typedef __swift_uint32_t __swift_mode_t;
5555
typedef __swift_uint16_t __swift_mode_t;
5656
#elif defined(_WIN32)
5757
typedef __swift_int32_t __swift_mode_t;
58+
#elif defined(__Fuchsia__)
59+
typedef __swift_uint32_t __swift_mode_t;
5860
#else // just guessing
5961
typedef __swift_uint16_t __swift_mode_t;
6062
#endif

stdlib/public/runtime/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ if(SWIFT_BUILD_STATIC_STDLIB)
8686
if(NOT "${sdk}" STREQUAL "LINUX" AND
8787
NOT "${sdk}" STREQUAL "FREEBSD" AND
8888
NOT "${sdk}" STREQUAL "ANDROID" AND
89-
NOT "${sdk}" STREQUAL "FUCHSIA"))
89+
NOT "${sdk}" STREQUAL "FUCHSIA")
9090
continue()
9191
endif()
9292

stdlib/public/stubs/Stubs.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
#define NOMINMAX
2727
#include <windows.h>
2828
#else
29-
#if !defined(__HAIKU__)
30-
#include <sys/errno.h>
31-
#else
29+
#if defined(__HAIKU__) || defined(__Fuchsia__)
3230
#include <errno.h>
31+
#else
32+
#include <sys/errno.h>
3333
#endif
3434
#include <sys/resource.h>
3535
#include <unistd.h>

0 commit comments

Comments
 (0)