Module Name: xsrc
Committed By: mrg
Date: Tue Aug 16 07:39:45 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-geode/dist/src: geode.h gx_accel.c
gx_driver.c gx_randr.c lx_cursor.c lx_driver.c lx_exa.c
Log Message:
include xorg-server.h which is normally included by config.h.
(this change isn't a candidate for upstream.)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-geode/dist/src/geode.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c \
xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c \
xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-geode/dist/src/geode.h
diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.2 xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.3
--- xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.2 Mon Jul 20 06:34:03 2015
+++ xsrc/external/mit/xf86-video-geode/dist/src/geode.h Tue Aug 16 07:39:45 2016
@@ -32,6 +32,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#ifdef HAVE_XAA_H
#include "xaa.h"
#endif
Index: xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c:1.1.1.2 xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c:1.2
--- xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c:1.1.1.2 Thu Mar 20 06:54:20 2014
+++ xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c Tue Aug 16 07:39:45 2016
@@ -37,6 +37,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "vgaHW.h"
#include "xf86.h"
#ifdef HAVE_XAA_H
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c:1.1.1.2 xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c:1.2
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c:1.1.1.2 Thu Mar 20 06:54:20 2014
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c Tue Aug 16 07:39:45 2016
@@ -27,6 +27,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86i2c.h"
#include "xf86Crtc.h"
Index: xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.1.1.4 xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.2
--- xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.1.1.4 Mon Jul 20 00:02:17 2015
+++ xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c Tue Aug 16 07:39:45 2016
@@ -36,6 +36,7 @@
#include <unistd.h>
#include <sys/mman.h>
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -450,7 +451,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
EntityInfoPtr pEnt;
rgb defaultWeight = { 0, 0, 0 };
int modecnt;
- char *s, *panelgeo;
+ const char *s, *panelgeo;
Bool useVGA;
if (pScrni->numEntities != 1)
Index: xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c:1.1.1.4 xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c:1.2
--- xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c:1.1.1.4 Thu Mar 20 06:54:20 2014
+++ xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c Tue Aug 16 07:39:45 2016
@@ -30,6 +30,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86Modes.h"
#include "os.h"
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.1.1.5 xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.2
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.1.1.5 Mon Jul 20 00:02:17 2015
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c Tue Aug 16 07:39:45 2016
@@ -37,6 +37,7 @@
#include <unistd.h>
#include <sys/mman.h>
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -309,7 +310,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
EntityInfoPtr pEnt;
OptionInfoRec *GeodeOptions = &LX_GeodeOptions[0];
rgb defaultWeight = { 0, 0, 0 };
- char *s;
+ const char *s;
if (pScrni->numEntities != 1)
return FALSE;
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c:1.1.1.3 xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c:1.2
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c:1.1.1.3 Thu Mar 20 06:54:20 2014
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c Tue Aug 16 07:39:45 2016
@@ -36,6 +36,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "exa.h"
