From 6dd755aa923291db2501cc5c22e409c41a70e3c1 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 1 Oct 2013 12:23:16 +0200 Subject: Update following packages: libXpm-3.5.11 libXaw-1.0.12 libXfont-1.4.6 libXrender-0.9.8 xproto-7.0.24 inputproto-2.3 xclock-1.0.7 xhost-1.0.6 --- libXaw/src/Vendor.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'libXaw/src/Vendor.c') diff --git a/libXaw/src/Vendor.c b/libXaw/src/Vendor.c index 12618e9cd..b8797f59d 100644 --- a/libXaw/src/Vendor.c +++ b/libXaw/src/Vendor.c @@ -111,30 +111,12 @@ static XtResource resources[] = { * ***************************************************************************/ -#if defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(__CYGWIN__) || defined(__MINGW32__) /* 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(__UNIXOS2__) -unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag) -{ - switch (flag) { - case 0: /*called on init*/ - _CRT_init(); - vendorShellWidgetClass = (WidgetClass)(&_XawVendorShellClassRec); - _XawFixupVendorShell(); - return 1; - case 1: /*called on exit*/ - return 1; - default: - return 0; - } -} -#endif - -#if defined(__CYGWIN__) || defined(__MINGW32__) int __stdcall DllMain(unsigned long mod_handle, unsigned long flag, void *routine) { @@ -149,7 +131,6 @@ DllMain(unsigned long mod_handle, unsigned long flag, void *routine) } return 1; } -#endif #define vendorShellClassRec _XawVendorShellClassRec -- cgit v1.2.3