Attachment 16514 Details for Bug 15147 – Fix duplicate checks introduced by original patch

[patch] Fix duplicate checks introduced by original patch

fix-duplicates.patch (text/plain), 2.12 KB, created by Matt Turner on 2008-05-13 18:39:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Turner

Created: 2008-05-13 18:39:30 UTC

Size: 2.12 KB

patch

obsolete

>diff --git a/fb/fb.h b/fb/fb.h
>index 1cd9473..0a8539a 100644
>--- a/fb/fb.h
>+++ b/fb/fb.h
>@@ -141,7 +141,7 @@ typedef unsigned __int64    FbBits;
>       defined(ia64) || defined(__ia64__) || \
>       defined(__sparc64__) || defined(_LP64) || \
>       defined(__s390x__) || \
>-      defined(amd64) || defined (__amd64__) || defined(__x86_64__) || \
>+      defined (__amd64__) || defined(__x86_64__) || \
>       defined (__powerpc64__) || \
>       (defined(sgi) && (_MIPS_SZLONG == 64))
> typedef unsigned long	    FbBits;
>diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
>index 41968e1..d7c586f 100644
>--- a/hw/xfree86/x86emu/prim_ops.c
>+++ b/hw/xfree86/x86emu/prim_ops.c
>@@ -103,7 +103,7 @@
> #include "x86emu/x86emui.h"
> 
> #if defined(__GNUC__)
>-# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__)
>+# if defined (__i386__) || defined(__i386) || defined(__x86_64__) || defined(__amd64__)
> #  include "x86emu/prim_x86_gcc.h"
> # endif
> #endif
>diff --git a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
>index 5a443cd..276758d 100644
>--- a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
>+++ b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
>@@ -42,7 +42,7 @@
> 
> #include "x86emu/types.h"
> 
>-#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__))
>+#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__x86_64__) || defined(__amd64__))
> #error This file is intended to be used by gcc on i386 or x86-64 system
> #endif
> 
>diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h
>index 2d41b0f..b9b81d9 100644
>--- a/hw/xfree86/x86emu/x86emu/types.h
>+++ b/hw/xfree86/x86emu/x86emu/types.h
>@@ -75,7 +75,7 @@
>     defined(__sparc64__) || \
>     defined(__s390x__) || \
>     (defined(__hppa__) && defined(__LP64)) || \
>-    defined(__amd64__) || defined(amd64) || defined(__x86_64__) || \
>+    defined(__amd64__) || defined(__x86_64__) || \
>     (defined(__sgi) && (_MIPS_SZLONG == 64))
> #define NUM32 int
> #else

Actions: View | Splinter Review

Attachments on bug 15147: 15341 | 15342 | 15913 | 16514

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.