Module Name: xsrc
Committed By: mrg
Date: Sat May 22 10:12:55 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_dac.c g80_sor.c
Log Message:
merge xf86-video-nv 2.1.17
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.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-nv/dist/src/g80_dac.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.2 Sat May 22 07:25:02 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c Sat May 22 10:12:55 2010
@@ -27,7 +27,13 @@
#include <unistd.h>
+#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
+#else
+#define DPMS_SERVER
+#include <X11/extensions/dpms.h>
+#endif
+
#include <xf86_OSproc.h>
#include "g80_type.h"
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.2 Sat May 22 07:25:02 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c Sat May 22 10:12:55 2010
@@ -25,7 +25,13 @@
#include "config.h"
#endif
+#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
+#else
+#define DPMS_SERVER
+#include <X11/extensions/dpms.h>
+#endif
+
#include <X11/Xatom.h>
#include "g80_type.h"
