From 15aab1ef982fb67eb2ea463089f070afd9a2cfe5 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 13 Oct 2010 09:50:25 +0100 Subject: [PATCH] Move EDID_COMPLETE_RAWDATA define to intel.h to avoid redifinition warning The compiler was simply warning that we defined the name prior to including the original definition, so reorder. Signed-off-by: Chris Wilson --- src/common.h | 5 ----- src/intel.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common.h b/src/common.h index 800e17ff..6f23cdd8 100644 --- a/src/common.h +++ b/src/common.h @@ -172,11 +172,6 @@ static inline void memcpy_volatile(volatile void *dst, const void *src, #define PIPE_NAME(n) ('A' + (n)) -/* remain compatible to xorg-server 1.6 */ -#ifndef MONITOR_EDID_COMPLETE_RAWDATA -#define MONITOR_EDID_COMPLETE_RAWDATA EDID_COMPLETE_RAWDATA -#endif - struct pci_device * intel_host_bridge (void); diff --git a/src/intel.h b/src/intel.h index b74a0618..6b059976 100644 --- a/src/intel.h +++ b/src/intel.h @@ -160,6 +160,11 @@ list_is_empty(struct list *head) pos = list_entry(pos->member.next, type, member)) #endif +/* remain compatible to xorg-server 1.6 */ +#ifndef MONITOR_EDID_COMPLETE_RAWDATA +#define MONITOR_EDID_COMPLETE_RAWDATA EDID_COMPLETE_RAWDATA +#endif + struct intel_pixmap { dri_bo *bo;