changeset 403:68546fac98c4

merge
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sun, 27 Jul 2008 13:47:11 +0200
parents 56a1c1c52142 (diff) 62715be72a06 (current diff)
children c39813438df7
files
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tango/lib/compiler/llvmdc/dmain2.d	Sun Jul 27 13:29:31 2008 +0200
+++ b/tango/lib/compiler/llvmdc/dmain2.d	Sun Jul 27 13:47:11 2008 +0200
@@ -23,8 +23,8 @@
     extern (Windows) wchar_t*   GetCommandLineW();
     extern (Windows) wchar_t**  CommandLineToArgvW(wchar_t*, int*);
     extern (Windows) export int WideCharToMultiByte(uint, uint, wchar_t*, int, char*, int, char*, int);
-    pragma(lib, "shell32.lib");   // needed for CommandLineToArgvW
-    pragma(lib, "tango-win32-dmd.lib"); // links Tango's Win32 library to reduce EXE size
+    //pragma(lib, "shell32.lib");   // needed for CommandLineToArgvW
+    //pragma(lib, "tango-win32-dmd.lib"); // links Tango's Win32 library to reduce EXE size
 }
 
 extern (C) void _STI_monitor_staticctor();
@@ -33,7 +33,6 @@
 extern (C) void _STD_critical_term();
 extern (C) void gc_init();
 extern (C) void gc_term();
-extern (C) void _minit();
 extern (C) void _moduleCtor();
 extern (C) void _moduleDtor();
 extern (C) void thread_joinAll();
@@ -102,8 +101,6 @@
     try
     {
         gc_init();
-        version (Win32)
-            _minit();
         _moduleCtor();
         return true;
     }
@@ -280,8 +277,6 @@
     {
         debug(PRINTF) printf("main runAll\n");
         gc_init();
-        version (Win32)
-            _minit();
         _moduleCtor();
         if (runModuleUnitTests())
             tryExec(&runMain);