Re: libs/wine: Fix regression caused by 5af634fd3b7ff7e4d6f8af34f6139315fdbbc8c4 for non-x86 architectures

[Austin English]

2011/1/13 André Hentschel <nerv(a)dawncrow.de>:
> ---
>  libs/wine/config.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/libs/wine/config.c b/libs/wine/config.c
> index e15012b..2c365a4 100644
> --- a/libs/wine/config.c
> +++ b/libs/wine/config.c
> @@ -456,7 +456,7 @@ const char *wine_get_build_id(void)
>  /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */
>  static void preloader_exec( char **argv, int use_preloader )
>  {
> -#ifdef linux
> +#ifdef linux && defined(__i386__) && defined(__x86_64__)
>     if (use_preloader)
>     {
>         static const char preloader[] = "wine-preloader";
> --

Causes a warning here:
./config.c:459:14: warning: extra tokens at end of #ifdef directive

Additionally, you're mixing ifdef and if defined.

I used the below patch on powerpc, which works well:
diff --git a/libs/wine/config.c b/libs/wine/config.c
index 4a2bced..7fce02b 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -456,7 +456,7 @@ const char *wine_get_build_id(void)
 /* exec a binary using the preloader if requested; helper for
wine_exec_wine_binary */
 static void preloader_exec( char **argv, int use_preloader )
 {
-#ifdef linux
+#if defined (__linux__) && (defined(__i386__) || defined(__x86_64__))
     if (use_preloader)
     {
         static const char preloader[] = "wine-preloader";

-- 
-Austin