[xserver-commit] xfree86/ddc ddcProperty.c,1.11,1.12 edid.c,1.5,1.6 edid.h,1.8,1.9 interpret_edid.c,1.9,1.10 interpret_vdif.c,1.7,1.8 print_edid.c,1.17,1.18 print_vdif.c,1.6,1.7 xf86DDC.c,1.28,1.29

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xfree86/ddc
In directory pdx:/tmp/cvs-serv14744/ddc

Modified Files:
	ddcProperty.c edid.c edid.h interpret_edid.c interpret_vdif.c 
	print_edid.c print_vdif.c xf86DDC.c 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: ddcProperty.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/ddcProperty.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/ddcProperty.c	19 Feb 2004 03:51:36 -0000	1.11
+++ b/ddcProperty.c	28 Feb 2004 01:27:38 -0000	1.12
@@ -5,6 +5,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 /* #include "xf86_ansic.h" */

Index: edid.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/edid.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/edid.c	19 Feb 2004 03:51:36 -0000	1.5
+++ b/edid.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -7,6 +7,9 @@
  * 
  * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: edid.h
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/edid.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/edid.h	19 Feb 2004 03:51:36 -0000	1.8
+++ b/edid.h	28 Feb 2004 01:27:38 -0000	1.9
@@ -114,8 +114,8 @@
 #define L3 _L3(GET_ARRAY(V_MANUFACTURER))
 
 /* extract information from version section */
-#define VERSION GET(V_VERSION)
-#define REVISION GET(V_REVISION)
+#define EDID_VERSION GET(V_VERSION)
+#define EDID_REVISION GET(V_REVISION)
 
 /* extract information from display section */
 #define _INPUT_TYPE(x) ((x & 0x80) >> 7)

Index: interpret_edid.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/interpret_edid.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/interpret_edid.c	19 Feb 2004 03:51:36 -0000	1.9
+++ b/interpret_edid.c	28 Feb 2004 01:27:38 -0000	1.10
@@ -4,6 +4,9 @@
  * 
  * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
@@ -61,8 +64,8 @@
 static void 
 get_version_section(Uchar *c, struct edid_version *r)
 {
-    r->version  = VERSION;
-    r->revision = REVISION;
+    r->version  = EDID_VERSION;
+    r->revision = EDID_REVISION;
 }
 
 static void 

Index: interpret_vdif.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/interpret_vdif.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/interpret_vdif.c	19 Feb 2004 03:51:36 -0000	1.7
+++ b/interpret_vdif.c	28 Feb 2004 01:27:38 -0000	1.8
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xarch.h>
 #include "xf86DDC.h"
 #include "vdif.h"

Index: print_edid.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/print_edid.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/print_edid.c	19 Feb 2004 03:51:36 -0000	1.17
+++ b/print_edid.c	28 Feb 2004 01:27:38 -0000	1.18
@@ -4,6 +4,9 @@
  * 
  * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: print_vdif.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/print_vdif.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/print_vdif.c	19 Feb 2004 03:51:36 -0000	1.6
+++ b/print_vdif.c	28 Feb 2004 01:27:38 -0000	1.7
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vdif.h"
 #include "misc.h"
 #include "xf86DDC.h"

Index: xf86DDC.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/xf86DDC.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- a/xf86DDC.c	19 Feb 2004 03:51:36 -0000	1.28
+++ b/xf86DDC.c	28 Feb 2004 01:27:38 -0000	1.29
@@ -4,6 +4,9 @@
  * 
  * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"