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

[stable] core.stdc.stdint: Fix some aliases for Windows/MSVC #2302

Merged
dlang-bot merged 4 commits into from
Sep 22, 2018
Merged

[stable] core.stdc.stdint: Fix some aliases for Windows/MSVC #2302

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c20e71c
core.stdc.stdint: Fix 32-bit aliases for 32-bit MSVC
kinke Sep 20, 2018
9284329
core.stdc.stdint: Beautify OSX block (NFC)
kinke Sep 22, 2018
f2ce39c
core.stdc.stdint: Simplify Posix block (NFC)
kinke Sep 22, 2018
72ba2c3
core.stdc.stdint: Merge Win32/64 blocks (NFC)
kinke Sep 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 86 additions & 154 deletions src/core/stdc/stdint.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,186 +35,118 @@ static if (is(ucent))
alias uint128_t = ucent; ///
}

version (Win32)
{
alias int8_t = byte; ///
alias int16_t = short; ///
alias uint8_t = ubyte; ///
alias uint16_t = ushort; ///
alias int32_t = cpp_long; ///
alias uint32_t = cpp_ulong; ///
Copy link
Contributor

@TurkeyMan TurkeyMan Sep 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O_o ... wow, wild ;)

alias int64_t = long; ///
alias uint64_t = ulong; ///

alias int_least8_t = byte; ///
alias uint_least8_t = ubyte; ///
alias int_least16_t = short; ///
alias uint_least16_t = ushort; ///
alias int_least32_t = cpp_long; ///
alias uint_least32_t = cpp_ulong; ///
alias int_least64_t = long; ///
alias uint_least64_t = ulong; ///

alias int_fast8_t = byte; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = int; ///
alias uint_fast16_t = uint; ///
alias int_fast32_t = cpp_long; ///
alias uint_fast32_t = cpp_ulong; ///
alias int_fast64_t = long; ///
alias uint_fast64_t = ulong; ///

alias intptr_t = int; ///
alias uintptr_t = uint; ///
alias intmax_t = long; ///
alias uintmax_t = ulong; ///
}
else version (Win64)
version (Windows)
{
alias int8_t = byte; ///
alias int16_t = short; ///
alias uint8_t = ubyte; ///
alias uint16_t = ushort; ///
alias int32_t = int; ///
alias uint32_t = uint; ///
version (CRuntime_DigitalMars)
{
alias int32_t = cpp_long; ///
alias uint32_t = cpp_ulong; ///
}
else
{
alias int32_t = int; ///
alias uint32_t = uint; ///
}
alias int64_t = long; ///
alias uint64_t = ulong; ///

alias int_least8_t = byte; ///
alias uint_least8_t = ubyte; ///
alias int_least16_t = short; ///
alias uint_least16_t = ushort; ///
alias int_least32_t = int; ///
alias uint_least32_t = uint; ///
alias int_least64_t = long; ///
alias uint_least64_t = ulong; ///

alias int_fast8_t = char; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = int; ///
alias uint_fast16_t = uint; ///
alias int_fast32_t = int; ///
alias uint_fast32_t = uint; ///
alias int_fast64_t = long; ///
alias uint_fast64_t = ulong; ///

alias intptr_t = long; ///
alias uintptr_t = ulong; ///
alias intmax_t = long; ///
alias uintmax_t = ulong; ///
alias int_least8_t = byte; ///
alias uint_least8_t = ubyte; ///
alias int_least16_t = short; ///
alias uint_least16_t = ushort; ///
alias int_least32_t = int32_t; ///
alias uint_least32_t = uint32_t; ///
alias int_least64_t = long; ///
alias uint_least64_t = ulong; ///

version (Win64) // TODO: this is wrong but tested in compilable/teststdint.d
alias int_fast8_t = char; ///
else
alias int_fast8_t = byte; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = int; ///
alias uint_fast16_t = uint; ///
alias int_fast32_t = int32_t; ///
alias uint_fast32_t = uint32_t; ///
alias int_fast64_t = long; ///
alias uint_fast64_t = ulong; ///

alias intptr_t = ptrdiff_t; ///
alias uintptr_t = size_t; ///
alias intmax_t = long; ///
alias uintmax_t = ulong; ///
}
else version (OSX)
{
alias int8_t = byte; ///
alias int16_t = short; ///
alias uint8_t = ubyte; ///
alias uint16_t = ushort; ///
alias int32_t = int; ///
alias uint32_t = uint; ///
alias int64_t = cpp_longlong; ///
alias uint64_t = cpp_ulonglong; ///

alias int_least8_t = byte; ///
alias uint_least8_t = ubyte; ///
alias int_least16_t = short; ///
alias uint_least16_t = ushort; ///
alias int_least32_t = int; ///
alias uint_least32_t = uint; ///
alias int_least64_t = int64_t; ///
alias uint_least64_t = uint64_t; ///

alias int_fast8_t = byte; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = short; ///
alias uint_fast16_t = ushort; ///
alias int_fast32_t = int; ///
alias uint_fast32_t = uint; ///
alias int_fast64_t = int64_t; ///
alias uint_fast64_t = uint64_t; ///

alias intptr_t = cpp_long; ///
alias uintptr_t = cpp_ulong; ///
alias intmax_t = long; ///
alias uintmax_t = ulong; ///
}
else version (Posix)
{
alias int8_t = byte; ///
alias int16_t = short; ///
alias uint8_t = ubyte; ///
alias uint16_t = ushort; ///
alias int32_t = int; ///
alias uint32_t = uint; ///
alias int64_t = cpp_longlong; ///
alias uint64_t = cpp_ulonglong; ///
alias int64_t = long; ///
alias uint64_t = ulong; ///

alias int_least8_t = byte; ///
alias uint_least8_t = ubyte; ///
alias int_least16_t = short; ///
alias uint_least16_t = ushort; ///
alias int_least32_t = int; ///
alias uint_least32_t = uint; ///
alias int_least64_t = int64_t; ///
alias uint_least64_t = uint64_t; ///
alias int_least64_t = long; ///
alias uint_least64_t = ulong; ///

alias int_fast8_t = byte; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = short; ///
alias uint_fast16_t = ushort; ///
alias int_fast32_t = int; ///
alias uint_fast32_t = uint; ///
alias int_fast64_t = int64_t; ///
alias uint_fast64_t = uint64_t; ///
alias int_fast8_t = byte; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = ptrdiff_t; ///
alias uint_fast16_t = size_t; ///
alias int_fast32_t = ptrdiff_t; ///
alias uint_fast32_t = size_t; ///
alias int_fast64_t = long; ///
alias uint_fast64_t = ulong; ///

alias intptr_t = cpp_long; ///
alias uintptr_t = cpp_ulong; ///
version (D_LP64)
{
alias intmax_t = cpp_long; ///
alias uintmax_t = cpp_ulong; ///
}
else
{
alias intmax_t = long; ///
alias uintmax_t = ulong; ///
}
}
else version (Posix)
{
version (D_LP64)
{
alias int8_t = byte; ///
alias int16_t = short; ///
alias uint8_t = ubyte; ///
alias uint16_t = ushort; ///
alias int32_t = int; ///
alias uint32_t = uint; ///
alias int64_t = cpp_long; ///
alias uint64_t = cpp_ulong; ///

alias int_least8_t = byte; ///
alias uint_least8_t = ubyte; ///
alias int_least16_t = short; ///
alias uint_least16_t = ushort; ///
alias int_least32_t = int; ///
alias uint_least32_t = uint; ///
alias int_least64_t = cpp_long; ///
alias uint_least64_t = cpp_ulong; ///

alias int_fast8_t = byte; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = cpp_long; ///
alias uint_fast16_t = cpp_ulong; ///
alias int_fast32_t = cpp_long; ///
alias uint_fast32_t = cpp_ulong; ///
alias int_fast64_t = cpp_long; ///
alias uint_fast64_t = cpp_ulong; ///

alias intptr_t = cpp_long; ///
alias uintptr_t = cpp_ulong; ///
alias intmax_t = cpp_long; ///
alias uintmax_t = cpp_ulong; ///
}
else
{
alias int8_t = byte; ///
alias int16_t = short; ///
alias uint8_t = ubyte; ///
alias uint16_t = ushort; ///
alias int32_t = int; ///
alias uint32_t = uint; ///
alias int64_t = long; ///
alias uint64_t = ulong; ///

alias int_least8_t = byte; ///
alias uint_least8_t = ubyte; ///
alias int_least16_t = short; ///
alias uint_least16_t = ushort; ///
alias int_least32_t = int; ///
alias uint_least32_t = uint; ///
alias int_least64_t = long; ///
alias uint_least64_t = ulong; ///

alias int_fast8_t = byte; ///
alias uint_fast8_t = ubyte; ///
alias int_fast16_t = int; ///
alias uint_fast16_t = uint; ///
alias int_fast32_t = int; ///
alias uint_fast32_t = uint; ///
alias int_fast64_t = long; ///
alias uint_fast64_t = ulong; ///

alias intptr_t = int ; ///
alias uintptr_t = uint; ///
alias intmax_t = long; ///
alias uintmax_t = ulong; ///
}
alias intptr_t = ptrdiff_t; ///
alias uintptr_t = size_t; ///
alias intmax_t = long; ///
alias uintmax_t = ulong; ///
}
else
{
Expand Down