Merge pull request #1986 from yebblies/globaldtor

[DDMD] Make global a struct without a default constructor
dlang · May 10, 2013 · 374e3dc · 374e3dc
2 parents 1290d1b + 4e16f23
commit 374e3dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/mars.c b/src/mars.c
@@ -56,7 +56,7 @@ FILE *stdmsg;
 
 Global global;
 
-Global::Global()
+void Global::init()
 {
     mars_ext = "d";
     sym_ext  = "d";
@@ -413,6 +413,7 @@ int tryMain(size_t argc, char *argv[])
     char noboundscheck = 0;
         int setdefaultlib = 0;
     const char *inifilename = NULL;
+    global.init();
 
 #ifdef DEBUG
     printf("DMD %s DEBUG\n", global.version);

diff --git a/src/mars.h b/src/mars.h
@@ -290,7 +290,7 @@ struct Global
      */
     bool endGagging(unsigned oldGagged);
 
-    Global();
+    void init();
 };
 
 extern Global global;