@@ -35,186 +35,127 @@ static if (is(ucent))
3535 alias uint128_t = ucent ; // /
3636}
3737
38- version (Win32 )
39- {
40- alias int8_t = byte ; // /
41- alias int16_t = short ; // /
42- alias uint8_t = ubyte ; // /
43- alias uint16_t = ushort ; // /
44- alias int32_t = cpp_long; // /
45- alias uint32_t = cpp_ulong; // /
46- alias int64_t = long ; // /
47- alias uint64_t = ulong ; // /
48-
49- alias int_least8_t = byte ; // /
50- alias uint_least8_t = ubyte ; // /
51- alias int_least16_t = short ; // /
52- alias uint_least16_t = ushort ; // /
53- alias int_least32_t = cpp_long; // /
54- alias uint_least32_t = cpp_ulong; // /
55- alias int_least64_t = long ; // /
56- alias uint_least64_t = ulong ; // /
57-
58- alias int_fast8_t = byte ; // /
59- alias uint_fast8_t = ubyte ; // /
60- alias int_fast16_t = int ; // /
61- alias uint_fast16_t = uint ; // /
62- alias int_fast32_t = cpp_long; // /
63- alias uint_fast32_t = cpp_ulong; // /
64- alias int_fast64_t = long ; // /
65- alias uint_fast64_t = ulong ; // /
66-
67- alias intptr_t = int ; // /
68- alias uintptr_t = uint ; // /
69- alias intmax_t = long ; // /
70- alias uintmax_t = ulong ; // /
71- }
72- else version (Win64 )
38+ version (Windows )
7339{
7440 alias int8_t = byte ; // /
7541 alias int16_t = short ; // /
7642 alias uint8_t = ubyte ; // /
7743 alias uint16_t = ushort ; // /
78- alias int32_t = int ; // /
79- alias uint32_t = uint ; // /
44+ version (CRuntime_DigitalMars )
45+ {
46+ alias int32_t = cpp_long; // /
47+ alias uint32_t = cpp_ulong; // /
48+ }
49+ else
50+ {
51+ alias int32_t = int ; // /
52+ alias uint32_t = uint ; // /
53+ }
8054 alias int64_t = long ; // /
8155 alias uint64_t = ulong ; // /
8256
83- alias int_least8_t = byte ; // /
84- alias uint_least8_t = ubyte ; // /
85- alias int_least16_t = short ; // /
86- alias uint_least16_t = ushort ; // /
87- alias int_least32_t = int ; // /
88- alias uint_least32_t = uint ; // /
89- alias int_least64_t = long ; // /
90- alias uint_least64_t = ulong ; // /
91-
92- alias int_fast8_t = char ; // /
93- alias uint_fast8_t = ubyte ; // /
94- alias int_fast16_t = int ; // /
95- alias uint_fast16_t = uint ; // /
96- alias int_fast32_t = int ; // /
97- alias uint_fast32_t = uint ; // /
98- alias int_fast64_t = long ; // /
99- alias uint_fast64_t = ulong ; // /
100-
101- alias intptr_t = long ; // /
102- alias uintptr_t = ulong ; // /
103- alias intmax_t = long ; // /
104- alias uintmax_t = ulong ; // /
57+ alias int_least8_t = byte ; // /
58+ alias uint_least8_t = ubyte ; // /
59+ alias int_least16_t = short ; // /
60+ alias uint_least16_t = ushort ; // /
61+ alias int_least32_t = int32_t ; // /
62+ alias uint_least32_t = uint32_t ; // /
63+ alias int_least64_t = long ; // /
64+ alias uint_least64_t = ulong ; // /
65+
66+ alias int_fast8_t = byte ; // /
67+ alias uint_fast8_t = ubyte ; // /
68+ alias int_fast16_t = int ; // /
69+ alias uint_fast16_t = uint ; // /
70+ alias int_fast32_t = int32_t ; // /
71+ alias uint_fast32_t = uint32_t ; // /
72+ alias int_fast64_t = long ; // /
73+ alias uint_fast64_t = ulong ; // /
74+
75+ alias intptr_t = ptrdiff_t ; // /
76+ alias uintptr_t = size_t ; // /
77+ alias intmax_t = long ; // /
78+ alias uintmax_t = ulong ; // /
10579}
10680else version (OSX )
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 = cpp_longlong; // /
89+ alias uint64_t = cpp_ulonglong; // /
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 = int64_t ; // /
98+ alias uint_least64_t = uint64_t ; // /
99+
100+ alias int_fast8_t = byte ; // /
101+ alias uint_fast8_t = ubyte ; // /
102+ alias int_fast16_t = short ; // /
103+ alias uint_fast16_t = ushort ; // /
104+ alias int_fast32_t = int ; // /
105+ alias uint_fast32_t = uint ; // /
106+ alias int_fast64_t = int64_t ; // /
107+ alias uint_fast64_t = uint64_t ; // /
108+
109+ alias intptr_t = cpp_long; // /
110+ alias uintptr_t = cpp_ulong; // /
111+ alias intmax_t = long ; // /
112+ alias uintmax_t = ulong ; // /
113+ }
114+ else version (Posix )
107115{
108116 alias int8_t = byte ; // /
109117 alias int16_t = short ; // /
110118 alias uint8_t = ubyte ; // /
111119 alias uint16_t = ushort ; // /
112120 alias int32_t = int ; // /
113121 alias uint32_t = uint ; // /
114- alias int64_t = cpp_longlong; // /
115- alias uint64_t = cpp_ulonglong; // /
122+ alias int64_t = long ; // /
123+ alias uint64_t = ulong ; // /
116124
117125 alias int_least8_t = byte ; // /
118126 alias uint_least8_t = ubyte ; // /
119127 alias int_least16_t = short ; // /
120128 alias uint_least16_t = ushort ; // /
121129 alias int_least32_t = int ; // /
122130 alias uint_least32_t = uint ; // /
123- alias int_least64_t = int64_t ; // /
124- alias uint_least64_t = uint64_t ; // /
125-
126- alias int_fast8_t = byte ; // /
127- alias uint_fast8_t = ubyte ; // /
128- alias int_fast16_t = short ; // /
129- alias uint_fast16_t = ushort ; // /
130- alias int_fast32_t = int ; // /
131- alias uint_fast32_t = uint ; // /
132- alias int_fast64_t = int64_t ; // /
133- alias uint_fast64_t = uint64_t ; // /
131+ alias int_least64_t = long ; // /
132+ alias uint_least64_t = ulong ; // /
134133
135- alias intptr_t = cpp_long; // /
136- alias uintptr_t = cpp_ulong; // /
137- version (D_LP64 )
134+ version (FreeBSD )
138135 {
139- alias intmax_t = cpp_long; // /
140- alias uintmax_t = cpp_ulong; // /
136+ alias int_fast8_t = int ; // /
137+ alias uint_fast8_t = uint ; // /
138+ alias int_fast16_t = int ; // /
139+ alias uint_fast16_t = uint ; // /
140+ alias int_fast32_t = int ; // /
141+ alias uint_fast32_t = uint ; // /
141142 }
142143 else
143144 {
144- alias intmax_t = long ; // /
145- alias uintmax_t = ulong ; // /
146- }
147- }
148- else version (Posix )
149- {
150- version (D_LP64 )
151- {
152- alias int8_t = byte ; // /
153- alias int16_t = short ; // /
154- alias uint8_t = ubyte ; // /
155- alias uint16_t = ushort ; // /
156- alias int32_t = int ; // /
157- alias uint32_t = uint ; // /
158- alias int64_t = cpp_long; // /
159- alias uint64_t = cpp_ulong; // /
160-
161- alias int_least8_t = byte ; // /
162- alias uint_least8_t = ubyte ; // /
163- alias int_least16_t = short ; // /
164- alias uint_least16_t = ushort ; // /
165- alias int_least32_t = int ; // /
166- alias uint_least32_t = uint ; // /
167- alias int_least64_t = cpp_long; // /
168- alias uint_least64_t = cpp_ulong; // /
169-
170145 alias int_fast8_t = byte ; // /
171146 alias uint_fast8_t = ubyte ; // /
172- alias int_fast16_t = cpp_long; // /
173- alias uint_fast16_t = cpp_ulong; // /
174- alias int_fast32_t = cpp_long; // /
175- alias uint_fast32_t = cpp_ulong; // /
176- alias int_fast64_t = cpp_long; // /
177- alias uint_fast64_t = cpp_ulong; // /
178-
179- alias intptr_t = cpp_long; // /
180- alias uintptr_t = cpp_ulong; // /
181- alias intmax_t = cpp_long; // /
182- alias uintmax_t = cpp_ulong; // /
183- }
184- else
185- {
186- alias int8_t = byte ; // /
187- alias int16_t = short ; // /
188- alias uint8_t = ubyte ; // /
189- alias uint16_t = ushort ; // /
190- alias int32_t = int ; // /
191- alias uint32_t = uint ; // /
192- alias int64_t = long ; // /
193- alias uint64_t = ulong ; // /
194-
195- alias int_least8_t = byte ; // /
196- alias uint_least8_t = ubyte ; // /
197- alias int_least16_t = short ; // /
198- alias uint_least16_t = ushort ; // /
199- alias int_least32_t = int ; // /
200- alias uint_least32_t = uint ; // /
201- alias int_least64_t = long ; // /
202- alias uint_least64_t = ulong ; // /
203-
204- alias int_fast8_t = byte ; // /
205- alias uint_fast8_t = ubyte ; // /
206- alias int_fast16_t = int ; // /
207- alias uint_fast16_t = uint ; // /
208- alias int_fast32_t = int ; // /
209- alias uint_fast32_t = uint ; // /
210- alias int_fast64_t = long ; // /
211- alias uint_fast64_t = ulong ; // /
212-
213- alias intptr_t = int ; // /
214- alias uintptr_t = uint ; // /
215- alias intmax_t = long ; // /
216- alias uintmax_t = ulong ; // /
147+ alias int_fast16_t = ptrdiff_t ; // /
148+ alias uint_fast16_t = size_t ; // /
149+ alias int_fast32_t = ptrdiff_t ; // /
150+ alias uint_fast32_t = size_t ; // /
217151 }
152+ alias int_fast64_t = long ; // /
153+ alias uint_fast64_t = ulong ; // /
154+
155+ alias intptr_t = ptrdiff_t ; // /
156+ alias uintptr_t = size_t ; // /
157+ alias intmax_t = long ; // /
158+ alias uintmax_t = ulong ; // /
218159}
219160else
220161{
0 commit comments