xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/ddc/edid.h |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 027ff97a1354ab4c83fecb615f6bc2a6b739b871
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Dec 5 12:00:08 2008 -0800

    Make sure _X_EXPORT is defined in edid.h
    
    Fixes build error in xf86-video-intel utilities

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index aeda6b3..31bc7c1 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -12,6 +12,10 @@
 #ifndef _EDID_H_
 #define _EDID_H_ 
 
+#ifndef _X_EXPORT
+# include <X11/Xfuncproto.h>
+#endif
+
 /* read complete EDID record */
 #define EDID1_LEN 128
 #define BITS_PER_BYTE 9