[Spice-devel] [win32-qxl] Remove redundant macro definitions.

[Frediano Ziglio]

Looks fine. However before acking I usually at least apply and compile the
patches.

I remember we got a presentation on how to build these driver but I don't
actually remember how to do it.

> 
> A change to spice-procotol adds spice/macros.h to the qxl build.  This
> causes a few macros to be redefined, resulting in warnings that break the
> build.
> 
> Explicitly including the spice/macros.h file in place of the
> redundant macros fixes the warnings.
> ---
>  xddm/display/quic.c  | 2 --
>  xddm/display/utils.h | 4 +---
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/xddm/display/quic.c b/xddm/display/quic.c
> index ee12fab..504c719 100644
> --- a/xddm/display/quic.c
> +++ b/xddm/display/quic.c
> @@ -60,8 +60,6 @@
>  #define QUIC_VERSION_MINOR 1U
>  #define QUIC_VERSION ((QUIC_VERSION_MAJOR << 16) | (QUIC_VERSION_MAJOR &
>  0xffff))
>  
> -#define ABS(a) ((a) >= 0 ? (a) : -(a))
> -
>  #ifdef ASSERT
>  #undef ASSERT
>  #endif
> diff --git a/xddm/display/utils.h b/xddm/display/utils.h
> index a8d0de6..d5283c5 100644
> --- a/xddm/display/utils.h
> +++ b/xddm/display/utils.h
> @@ -21,9 +21,7 @@
>  
>  #ifndef _H_UTILS
>  #define _H_UTILS
> -
> -#define MIN(x, y) (((x) <= (y)) ? (x) : (y))
> -#define MAX(x, y) (((x) >= (y)) ? (x) : (y))
> +#include <spice/macros.h>
>  #define ALIGN(a, b) (((a) + ((b) - 1)) & ~((b) - 1))
>  
>  
> --
> 1.9.5.msysgit.0
> 
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>