Skip to content

Commit 5fa0f90

Browse files
authored
Merge pull request #3119 from ljmf00/remove-dup-long-types
spec: interfaceToC: remove duplicate ulong type on the table Signed-off-by: Petar Kirov <PetarKirov@users.noreply.github.com> Merged-on-behalf-of: Petar Kirov <PetarKirov@users.noreply.github.com>
2 parents 8d505e3 + 8c731ce commit 5fa0f90

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

articles/ctod.dd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ signed char =&gt; byte
8585
unsigned char =&gt; ubyte
8686
short =&gt; short
8787
unsigned short =&gt; ushort
88-
wchar_t =&gt; wchar
88+
wchar_t =&gt; core.stdc.stddef.wchar_t
8989
int =&gt; int
9090
unsigned =&gt; uint
91-
long =&gt; int
92-
unsigned long =&gt; uint
91+
long =&gt; core.stdc.config.c_long
92+
unsigned long =&gt; core.stdc.config.c_ulong
9393
long long =&gt; long
9494
unsigned long long =&gt; ulong
9595
float =&gt; float

spec/interfaceToC.dd

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,16 @@ $(H2 $(LNAME2 data_type_compat, Data Type Compatibility))
150150
$(TROW2 int, int)
151151
$(TROW2 uint, unsigned)
152152

153-
$(TROW3 ulong, unsigned long long, unsigned long)
154153
$(TROW3 core.stdc.config.c_long, long, long)
155-
156-
157154
$(TROW3 core.stdc.config.c_ulong, unsigned long, unsigned long)
155+
158156
$(TROW3PLUS long, long long, long, (or $(D long long)))
159157
$(TROW3PLUS ulong, unsigned long long, unsigned long, (or $(D unsigned long long)))
160158

161159
$(TROW2 float, float)
162160
$(TROW2 double, double)
163161
$(TROW2 real, long double)
164162

165-
166-
167163
$(TROW2 cdouble, double _Complex)
168164
$(TROW2 creal, long double _Complex)
169165
$(TROW2 struct, struct)

0 commit comments

Comments
 (0)