diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 14:04:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 14:04:45 +0200 |
| commit | 6a9745b567d0500601b5977022b0fc5e1488f5a1 (patch) | |
| tree | 0b1b60872ea994870f4e61c2e9affe56a6c6d133 /libXaw/src/Vendor.c | |
| parent | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (diff) | |
| download | vcxsrv-6a9745b567d0500601b5977022b0fc5e1488f5a1.tar.gz vcxsrv-6a9745b567d0500601b5977022b0fc5e1488f5a1.tar.bz2 vcxsrv-6a9745b567d0500601b5977022b0fc5e1488f5a1.zip | |
Solved error due to latest merge
Diffstat (limited to 'libXaw/src/Vendor.c')
| -rwxr-xr-x | libXaw/src/Vendor.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |