diff --git a/src/dmd/backend/dt.c b/src/dmd/backend/dt.c index 2d7835acc0fa..2a31831bea9b 100644 --- a/src/dmd/backend/dt.c +++ b/src/dmd/backend/dt.c @@ -325,7 +325,7 @@ void DtBuilder::dword(int value) /*********************** * Write a size_t value. */ -void DtBuilder::size(d_ulong value) +void DtBuilder::size(unsigned long value) { if (value == 0) { diff --git a/src/dmd/backend/dt.h b/src/dmd/backend/dt.h index 046be8da3b2c..0e24838dcef3 100644 --- a/src/dmd/backend/dt.h +++ b/src/dmd/backend/dt.h @@ -5,16 +5,6 @@ #include // for size_t -#if __APPLE__ && __i386__ - /* size_t is 'unsigned long', which makes it mangle differently - * than D's 'uint' - */ - typedef unsigned d_size_t; -#else - typedef size_t d_size_t; -#endif - - struct dt_t; struct Symbol; typedef unsigned tym_t; // data type big enough for type masks @@ -30,12 +20,6 @@ bool dtallzeros(const dt_t *dt); bool dtpointers(const dt_t *dt); void dt2common(dt_t **pdt); -#if __LP64__ -#define d_ulong unsigned long -#else -#define d_ulong unsigned long long -#endif - class DtBuilder { private: @@ -51,7 +35,7 @@ class DtBuilder void abytes(tym_t ty, unsigned offset, unsigned size, const char *ptr, unsigned nzeros); void abytes(unsigned offset, unsigned size, const char *ptr, unsigned nzeros); void dword(int value); - void size(d_ulong value); + void size(unsigned long value); void nzeros(unsigned size); void xoff(Symbol *s, unsigned offset, tym_t ty); dt_t *xoffpatch(Symbol *s, unsigned offset, tym_t ty); @@ -60,7 +44,7 @@ class DtBuilder void coff(unsigned offset); void cat(dt_t *dt); void cat(DtBuilder *dtb); - void repeat(dt_t *dt, d_size_t count); + void repeat(dt_t *dt, size_t count); unsigned length(); bool isZeroLength(); }; diff --git a/src/dmd/backend/outbuf.h b/src/dmd/backend/outbuf.h index bbe864a6e001..7d055531d122 100644 --- a/src/dmd/backend/outbuf.h +++ b/src/dmd/backend/outbuf.h @@ -15,15 +15,6 @@ #include // for size_t -#if __APPLE__ && __i386__ - /* size_t is 'unsigned long', which makes it mangle differently - * than D's 'uint' - */ - typedef unsigned d_size_t; -#else - typedef size_t d_size_t; -#endif - // Output buffer // (This used to be called OutBuffer, we renamed it to avoid name conflicts with Mars.) @@ -47,14 +38,14 @@ struct Outbuffer void reset(); // Reserve nbytes in buffer - void reserve(d_size_t nbytes) + void reserve(size_t nbytes) { if (pend - p < nbytes) enlarge(nbytes); } // Reserve nbytes in buffer - void enlarge(d_size_t nbytes); + void enlarge(size_t nbytes); // Write n zeros; return pointer to start of zeros void *writezeros(d_size_t n); diff --git a/src/dmd/tk/mem.c b/src/dmd/tk/mem.c index c62bafc3a382..bfc1b89ea046 100644 --- a/src/dmd/tk/mem.c +++ b/src/dmd/tk/mem.c @@ -614,7 +614,7 @@ void mem_checkptr(void *p) /***************************/ -void *mem_malloc(d_size_t numbytes) +void *mem_malloc(size_t numbytes) { void *p; if (numbytes == 0) diff --git a/src/dmd/tk/mem.h b/src/dmd/tk/mem.h index 4e38fb9cacf5..df6739e06868 100644 --- a/src/dmd/tk/mem.h +++ b/src/dmd/tk/mem.h @@ -12,15 +12,6 @@ #include // for size_t -#if __APPLE__ && __i386__ - /* size_t is 'unsigned long', which makes it mangle differently - * than D's 'uint' - */ - typedef unsigned d_size_t; -#else - typedef size_t d_size_t; -#endif - /* * Memory management routines. * @@ -156,7 +147,7 @@ void mem_checkptr(void *ptr); * return NULL */ -void *mem_malloc(d_size_t); +void *mem_malloc(size_t); void *mem_calloc(size_t); /*****************************