diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-04 19:42:05 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-08 17:04:53 -0800 |
| commit | a5630e166921b5b5322b30fb152df01bb6536e42 (patch) | |
| tree | 09ce93637c54ceba82c98e483c9c91882030ddc8 | |
| parent | e360c7c86b9229ee9fe24b97aba2bfee5df05748 (diff) | |
| download | xorg-lib-libXaw-baserock/morph.tar.gz | |
unifdef -U__UNIXOS2__baserock/morph
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/Actions.c | 3 | ||||
| -rw-r--r-- | src/DisplayList.c | 3 | ||||
| -rw-r--r-- | src/Pixmap.c | 3 | ||||
| -rw-r--r-- | src/Vendor.c | 21 |
4 files changed, 1 insertions, 29 deletions
diff --git a/src/Actions.c b/src/Actions.c index 3a444b8..cec9bdd 100644 --- a/src/Actions.c +++ b/src/Actions.c @@ -41,9 +41,6 @@ #include <X11/Xfuncs.h> #include "Private.h" -#ifdef __UNIXOS2__ -static char dummy; -#endif #ifndef OLDXAW diff --git a/src/DisplayList.c b/src/DisplayList.c index 4ef89aa..3e99df4 100644 --- a/src/DisplayList.c +++ b/src/DisplayList.c @@ -41,9 +41,6 @@ #include <X11/Xmu/CharSet.h> #include "Private.h" -#ifdef __UNIXOS2__ -static char dummy; -#endif #ifndef OLDXAW diff --git a/src/Pixmap.c b/src/Pixmap.c index 6e3388c..d2fa1ef 100644 --- a/src/Pixmap.c +++ b/src/Pixmap.c @@ -40,9 +40,6 @@ #endif #include "Private.h" -#ifdef __UNIXOS2__ -static char dummy; -#endif #ifndef OLDXAW diff --git a/src/Vendor.c b/src/Vendor.c index 12618e9..b8797f5 100644 --- a/src/Vendor.c +++ b/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 |