From e13493f3d4e467363e681ac2a216fec58b9f8770 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 18 Jan 2011 22:22:10 +0000 Subject: dllmain should not be included in static lib --- libXt/src/Vendor.c | 4 ++-- libXt/src/makefile | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'libXt') diff --git a/libXt/src/Vendor.c b/libXt/src/Vendor.c index 2d3090189..94ca36e41 100644 --- a/libXt/src/Vendor.c +++ b/libXt/src/Vendor.c @@ -67,7 +67,7 @@ SOFTWARE. * ***************************************************************************/ -#if defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER) /* to fix the EditRes problem because of wrong linker semantics */ extern WidgetClass vendorShellWidgetClass; @@ -153,7 +153,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = { } }; -#if !defined(AIXSHLIB) || !defined(SHAREDCODE) +#if (!defined(AIXSHLIB) || !defined(SHAREDCODE)) && !defined(_MSC_VER) externaldef(vendorshellwidgetclass) WidgetClass vendorShellWidgetClass = (WidgetClass) (&vendorShellClassRec); #endif diff --git a/libXt/src/makefile b/libXt/src/makefile index 76441250c..a129f418b 100644 --- a/libXt/src/makefile +++ b/libXt/src/makefile @@ -58,7 +58,6 @@ CSRCS = \ VarGet.c \ Varargs.c \ Vendor.c \ - sharedlib.c \ StringDefs.c BUILT_SOURCE = StringDefs.c -- cgit v1.2.3