Module Name: xsrc
Committed By: mrg
Date: Tue Aug 16 08:11:45 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_driver.c g80_type.h
nv_include.h riva_include.h
Log Message:
include xorg-server.h which is normally included by config.h.
(this part of the change isn't a candidate for upstream.)
xf86GetOptValString() returns const char *
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h \
xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
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-nv/dist/src/g80_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.2 Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c Tue Aug 16 08:11:45 2016
@@ -28,6 +28,7 @@
#include <string.h>
+#include "xorg-server.h"
#include <xf86.h>
#include <xf86_OSproc.h>
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -163,7 +164,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
Bool primary;
const rgb zeros = {0, 0, 0};
const Gamma gzeros = {0.0, 0.0, 0.0};
- char *s;
+ const char *s;
CARD32 tmp;
memType BAR1sizeKB;
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.2 Wed Aug 20 09:54:04 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h Tue Aug 16 08:11:45 2016
@@ -1,3 +1,4 @@
+#include "xorg-server.h"
#include <exa.h>
#include <xf86.h>
#include <xf86int10.h>
Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.2 xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.2 Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h Tue Aug 16 08:11:45 2016
@@ -4,6 +4,7 @@
#include <string.h>
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.3 Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h Tue Aug 16 08:11:45 2016
@@ -6,6 +6,7 @@
#include <unistd.h>
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
