Skip to content

Commit 1e8c35d

Browse files
committed
[Stdlib] Move the declaration of __swift_ssize_t to SwiftStddef.h so Random.h/cpp can use it.
1 parent c4d5db4 commit 1e8c35d

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

stdlib/public/SwiftShims/LibcShims.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,6 @@
3131
namespace swift { extern "C" {
3232
#endif
3333

34-
// This declaration is not universally correct. We verify its correctness for
35-
// the current platform in the runtime code.
36-
#if defined(__linux__) && (defined(__arm__) || defined(__i386__))
37-
typedef int __swift_ssize_t;
38-
#elif defined(_WIN32)
39-
#if defined(_M_ARM) || defined(_M_IX86)
40-
typedef int __swift_ssize_t;
41-
#elif defined(_M_X64) || defined(_M_ARM64)
42-
typedef long long int __swift_ssize_t;
43-
#else
44-
#error unsupported machine type
45-
#endif
46-
#else
47-
typedef long int __swift_ssize_t;
48-
#endif
49-
5034
// This declaration might not be universally correct.
5135
// We verify its correctness for the current platform in the runtime code.
5236
#if defined(__linux__)

stdlib/public/SwiftShims/SwiftStddef.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,20 @@ typedef size_t __swift_size_t;
2828
typedef __SIZE_TYPE__ __swift_size_t;
2929
#endif
3030

31+
// This declaration is not universally correct. We verify its correctness for
32+
// the current platform in the runtime code.
33+
#if defined(__linux__) && (defined(__arm__) || defined(__i386__))
34+
typedef int __swift_ssize_t;
35+
#elif defined(_WIN32)
36+
#if defined(_M_ARM) || defined(_M_IX86)
37+
typedef int __swift_ssize_t;
38+
#elif defined(_M_X64) || defined(_M_ARM64)
39+
typedef long long int __swift_ssize_t;
40+
#else
41+
#error unsupported machine type
42+
#endif
43+
#else
44+
typedef long int __swift_ssize_t;
45+
#endif
46+
3147
#endif // SWIFT_STDLIB_SHIMS_SWIFT_STDDEF_H

0 commit comments

Comments
 (0)