From 6a9745b567d0500601b5977022b0fc5e1488f5a1 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 1 Oct 2013 14:04:45 +0200 Subject: Solved error due to latest merge --- libXaw/src/Vendor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libXaw') diff --git a/libXaw/src/Vendor.c b/libXaw/src/Vendor.c index 0ce5b6def..a2554daff 100755 --- a/libXaw/src/Vendor.c +++ b/libXaw/src/Vendor.c @@ -111,13 +111,12 @@ static XtResource resources[] = { * ***************************************************************************/ -#if defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER) /* to fix the EditRes problem because of wrong linker semantics */ extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */ extern VendorShellClassRec _XawVendorShellClassRec; extern void _XawFixupVendorShell(); -#if defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER) int __stdcall DllMain(unsigned long mod_handle, unsigned long flag, void *routine) { -- cgit v1.2.3