Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 72ba2c3

Browse files
committed
core.stdc.stdint: Merge Win32/64 blocks (NFC)
1 parent f2ce39c commit 72ba2c3

File tree

1 file changed

+9
-40
lines changed

1 file changed

+9
-40
lines changed

src/core/stdc/stdint.d

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static if (is(ucent))
3535
alias uint128_t = ucent; ///
3636
}
3737

38-
version (Win32)
38+
version (Windows)
3939
{
4040
alias int8_t = byte; ///
4141
alias int16_t = short; ///
@@ -63,7 +63,10 @@ version (Win32)
6363
alias int_least64_t = long; ///
6464
alias uint_least64_t = ulong; ///
6565

66-
alias int_fast8_t = byte; ///
66+
version (Win64) // TODO: this is wrong but tested in compilable/teststdint.d
67+
alias int_fast8_t = char; ///
68+
else
69+
alias int_fast8_t = byte; ///
6770
alias uint_fast8_t = ubyte; ///
6871
alias int_fast16_t = int; ///
6972
alias uint_fast16_t = uint; ///
@@ -72,44 +75,10 @@ version (Win32)
7275
alias int_fast64_t = long; ///
7376
alias uint_fast64_t = ulong; ///
7477

75-
alias intptr_t = int; ///
76-
alias uintptr_t = uint; ///
77-
alias intmax_t = long; ///
78-
alias uintmax_t = ulong; ///
79-
}
80-
else version (Win64)
81-
{
82-
alias int8_t = byte; ///
83-
alias int16_t = short; ///
84-
alias uint8_t = ubyte; ///
85-
alias uint16_t = ushort; ///
86-
alias int32_t = int; ///
87-
alias uint32_t = uint; ///
88-
alias int64_t = long; ///
89-
alias uint64_t = ulong; ///
90-
91-
alias int_least8_t = byte; ///
92-
alias uint_least8_t = ubyte; ///
93-
alias int_least16_t = short; ///
94-
alias uint_least16_t = ushort; ///
95-
alias int_least32_t = int; ///
96-
alias uint_least32_t = uint; ///
97-
alias int_least64_t = long; ///
98-
alias uint_least64_t = ulong; ///
99-
100-
alias int_fast8_t = char; ///
101-
alias uint_fast8_t = ubyte; ///
102-
alias int_fast16_t = int; ///
103-
alias uint_fast16_t = uint; ///
104-
alias int_fast32_t = int; ///
105-
alias uint_fast32_t = uint; ///
106-
alias int_fast64_t = long; ///
107-
alias uint_fast64_t = ulong; ///
108-
109-
alias intptr_t = long; ///
110-
alias uintptr_t = ulong; ///
111-
alias intmax_t = long; ///
112-
alias uintmax_t = ulong; ///
78+
alias intptr_t = ptrdiff_t; ///
79+
alias uintptr_t = size_t; ///
80+
alias intmax_t = long; ///
81+
alias uintmax_t = ulong; ///
11382
}
11483
else version (OSX)
11584
{

0 commit comments

Comments
 (0)