Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Chris Wilson 2010-10-13 09:50:25 +01:00
parent d2bc2212f8
commit 15aab1ef98
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common.h
View File

@ -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);

5
src/intel.h
View File

@ -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;