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

Commit 1c60346

Browse files
authored
Merge pull request #2281 from kinke/cpp_ulong
[stable] core.stdc.config: Don't define cpp_[u]long as special enum on 64-bit Posix merged-on-behalf-of: Steven Schveighoffer <schveiguy@users.noreply.github.com>
2 parents 45f340f + 9f6ba71 commit 1c60346

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

src/core/stdc/config.d

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,28 @@ version( Windows )
104104
enum __c_long : int;
105105
enum __c_ulong : uint;
106106

107-
alias __c_long cpp_long;
108-
alias __c_ulong cpp_ulong;
109-
110107
alias int c_long;
111108
alias uint c_ulong;
112109

110+
alias __c_long cpp_long;
111+
alias __c_ulong cpp_ulong;
112+
113113
alias long cpp_longlong;
114114
alias ulong cpp_ulonglong;
115115
}
116116
else version( Posix )
117117
{
118118
static if( (void*).sizeof > int.sizeof )
119119
{
120-
enum __c_long : long;
121-
enum __c_ulong : ulong;
122-
123120
enum __c_longlong : long;
124121
enum __c_ulonglong : ulong;
125122

126-
alias __c_long cpp_long;
127-
alias __c_ulong cpp_ulong;
128-
129123
alias long c_long;
130124
alias ulong c_ulong;
131125

126+
alias long cpp_long;
127+
alias ulong cpp_ulong;
128+
132129
alias __c_longlong cpp_longlong;
133130
alias __c_ulonglong cpp_ulonglong;
134131
}
@@ -137,12 +134,12 @@ else version( Posix )
137134
enum __c_long : int;
138135
enum __c_ulong : uint;
139136

140-
alias __c_long cpp_long;
141-
alias __c_ulong cpp_ulong;
142-
143137
alias int c_long;
144138
alias uint c_ulong;
145139

140+
alias __c_long cpp_long;
141+
alias __c_ulong cpp_ulong;
142+
146143
alias long cpp_longlong;
147144
alias ulong cpp_ulonglong;
148145
}

0 commit comments

Comments
 (0)