summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-13 08:50:25 (GMT)
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-13 08:51:57 (GMT)
commit15aab1ef982fb67eb2ea463089f070afd9a2cfe5 (patch)
tree1131ef59937057d26874066a5276a10ace119744
parentd2bc2212f8be746e697a65555d6d83bc66d9ce43 (diff)
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 <chris@chris-wilson.co.uk>
-rw-r--r--src/common.h5
-rw-r--r--src/intel.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common.h b/src/common.h
index 800e17f..6f23cdd 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 b74a061..6b05997 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;