From fde6cc98a888845f57cc4c631956a0a0bdc0bbe2 Mon Sep 17 00:00:00 2001 From: Tomas Lindquist Olsen Date: Sun, 27 Jul 2008 13:46:28 +0200 Subject: [PATCH] Removed unneeded references to _minit on Windows which breaks linking. _minit is an artifact of DMD on Win32. --- tango/lib/compiler/llvmdc/dmain2.d | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tango/lib/compiler/llvmdc/dmain2.d b/tango/lib/compiler/llvmdc/dmain2.d index c58542ac..05740e03 100644 --- a/tango/lib/compiler/llvmdc/dmain2.d +++ b/tango/lib/compiler/llvmdc/dmain2.d @@ -23,8 +23,8 @@ version( Win32 ) 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 _STI_critical_init(); 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 @@ extern (C) bool rt_init( void delegate( Exception ) dg = null ) try { gc_init(); - version (Win32) - _minit(); _moduleCtor(); return true; } @@ -280,8 +277,6 @@ extern (C) int main(int argc, char **argv, char** env) { debug(PRINTF) printf("main runAll\n"); gc_init(); - version (Win32) - _minit(); _moduleCtor(); if (runModuleUnitTests()) tryExec(&runMain);