[PATCH:libXaw] unifdef -U__UNIXOS2__

[Peter Hutterer]

On Fri, Jan 04, 2013 at 07:43:59PM -0800, Alan Coopersmith wrote:
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter

> ---
>  src/Actions.c     |    3 ---
>  src/DisplayList.c |    3 ---
>  src/Pixmap.c      |    3 ---
>  src/Vendor.c      |   21 +--------------------
>  4 files changed, 1 insertion(+), 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
>  
> -- 
> 1.7.9.2