comparison dmd/Type.d @ 23:460959608115

Branch merge.
author Robert Clipsham <robert@octarineparrot.com>
date Mon, 12 Apr 2010 17:00:08 +0100
parents 832f71e6f96c fd4acc376c45
children ccbc1e0bb3f0
comparison
equal deleted inserted replaced
13:427f8aa74d28 23:460959608115
80 */ 80 */
81 version (TARGET_OSX) { 81 version (TARGET_OSX) {
82 int REALSIZE = 16; 82 int REALSIZE = 16;
83 int REALPAD = 6; 83 int REALPAD = 6;
84 int REALALIGNSIZE = 16; 84 int REALALIGNSIZE = 16;
85 } else version (XXX) { /// TARGET_LINUX || TARGET_FREEBSD || TARGET_SOLARIS 85 } else version (POSIX) { /// TARGET_LINUX || TARGET_FREEBSD || TARGET_SOLARIS
86 int REALSIZE = 12; 86 int REALSIZE = 12;
87 int REALPAD = 2; 87 int REALPAD = 2;
88 int REALALIGNSIZE = 4; 88 int REALALIGNSIZE = 4;
89 } else { 89 } else {
90 int REALSIZE = 10; 90 int REALSIZE = 10;
1835 } 1835 }
1836 else 1836 else
1837 toDecoBuffer(buf); 1837 toDecoBuffer(buf);
1838 1838
1839 len = buf.offset; 1839 len = buf.offset;
1840 version (Bug4054)
1841 name = cast(char*)GC.malloc(19 + len.sizeof * 3 + len + 1);
1842 else
1840 name = cast(char*)alloca(19 + len.sizeof * 3 + len + 1); 1843 name = cast(char*)alloca(19 + len.sizeof * 3 + len + 1);
1841 buf.writeByte(0); 1844 buf.writeByte(0);
1842 version (TARGET_OSX) { 1845 version (TARGET_OSX) {
1843 // The LINKc will prepend the _ 1846 // The LINKc will prepend the _
1844 len = sprintf(name, "D%dTypeInfo_%s6__initZ".ptr, 9 + len, buf.data); 1847 len = sprintf(name, "D%dTypeInfo_%s6__initZ".ptr, 9 + len, buf.data);