Unify GC class and Gcx struct

[software/dgc/cdgc.git] / rt / gc / cdgc / iface.d

diff --git a/rt/gc/cdgc/iface.d b/rt/gc/cdgc/iface.d
index 3002284cfdc461c465223e057d33257bdd6ee090..721a4f322c65572bbb508f4c7d112b903ee91e8c 100644 (file)
--- a/rt/gc/cdgc/iface.d
+++ b/rt/gc/cdgc/iface.d
@@ -31,14 +31,8 @@ import rt.gc.cdgc.stats: GCStats;
 
 import cstdlib = tango.stdc.stdlib;
 
 
 import cstdlib = tango.stdc.stdlib;
 

-version=GCCLASS;

 
 

-version (GCCLASS)
-    alias GC gc_t;
-else
-    alias GC* gc_t;
-
-gc_t _gc;
+private GC* _gc;

 
 private int _termCleanupLevel=1;
 
 
 private int _termCleanupLevel=1;
 


@@ -64,17 +58,7 @@ extern (C) void thread_init();
 
 extern (C) void gc_init()
 {
 
 extern (C) void gc_init()
 {

-    version (GCCLASS)
-    {
-        ClassInfo ci = GC.classinfo;
-        void* p = cstdlib.malloc(ci.init.length);
-        (cast(byte*)p)[0 .. ci.init.length] = ci.init[];
-        _gc = cast(GC)p;
-    }
-    else
-    {
-        _gc = cast(GC*) cstdlib.calloc(1, GC.sizeof);
-    }
+    _gc = cast(GC*) cstdlib.calloc(1, GC.sizeof);

     _gc.initialize();
     version (DigitalMars) version(OSX) {
         _d_osx_image_init();
     _gc.initialize();
     version (DigitalMars) version(OSX) {
         _d_osx_image_init();