Module Name: xsrc
Committed By: mrg
Date: Wed Nov 24 02:54:10 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e_driver.c
xsrc/external/mit/xf86-video-crime/dist/src: crime_driver.c
xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c
xsrc/external/mit/xf86-video-imstt/dist/src: imstt_driver.c
xsrc/external/mit/xf86-video-intel/dist/src: i810_driver.c
xsrc/external/mit/xf86-video-newport/dist/src: newport_driver.c
xsrc/external/mit/xf86-video-nvxbox/dist/src: nv_driver.c
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_driver.c
xsrc/external/mit/xf86-video-radeonhd/dist/src: rhd_driver.c
xsrc/external/mit/xf86-video-vga/dist/src: generic.c
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
fix the previous - use GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-vga/dist/src/generic.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.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-ag10e/dist/src/ag10e_driver.c
diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.4 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.5
--- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.4 Tue Nov 23 22:21:15 2010
+++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c Wed Nov 24 02:54:07 2010
@@ -46,7 +46,7 @@
#include "ag10e.h"
#include "xf86sbusBus.h"
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.7 xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.8
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.7 Tue Nov 23 22:21:15 2010
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c Wed Nov 24 02:54:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_driver.c,v 1.7 2010/11/23 22:21:15 mrg Exp $ */
+/* $NetBSD: crime_driver.c,v 1.8 2010/11/24 02:54:07 mrg Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -70,7 +70,7 @@
#include <sys/mman.h>
#endif
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.4 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.5
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.4 Tue Nov 23 23:21:28 2010
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Wed Nov 24 02:54:08 2010
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.4 2010/11/23 23:21:28 mrg Exp $ */
+/* $NetBSD: igs_driver.c,v 1.5 2010/11/24 02:54:08 mrg Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -71,7 +71,7 @@
/* for visuals */
#include "fb.h"
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
@@ -84,7 +84,7 @@
#include <sys/mman.h>
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c
diff -u xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c:1.3 xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c:1.4
--- xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c:1.3 Tue Nov 23 22:21:15 2010
+++ xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c Wed Nov 24 02:54:08 2010
@@ -55,7 +55,7 @@
#include "imstt.h"
#include "imstt_reg.h"
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.4 xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.5
--- xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.4 Tue Nov 23 22:21:16 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c Wed Nov 24 02:54:08 2010
@@ -89,7 +89,7 @@
#include "dri.h"
#endif
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.6 xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.7
--- xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.6 Tue Nov 23 22:21:16 2010
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c Wed Nov 24 02:54:08 2010
@@ -65,7 +65,7 @@
#include <string.h>
#include <stdio.h>
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c:1.2 xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c:1.3
--- xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c:1.2 Tue Nov 23 22:21:16 2010
+++ xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c Wed Nov 24 02:54:09 2010
@@ -39,7 +39,7 @@
#include "xf86int10.h"
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.2 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.3
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.2 Tue Nov 23 22:21:16 2010
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c Wed Nov 24 02:54:09 2010
@@ -20,7 +20,7 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: pnozz_driver.c,v 1.2 2010/11/23 22:21:16 mrg Exp $ */
+/* $NetBSD: pnozz_driver.c,v 1.3 2010/11/24 02:54:09 mrg Exp $ */
/*
* this driver has been tested on SPARCbook 3GX and 3TX, it supports full
@@ -49,7 +49,7 @@
#include "xf86cmap.h"
#include "pnozz.h"
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c:1.2 xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c:1.3
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c:1.2 Tue Nov 23 22:21:16 2010
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c Wed Nov 24 02:54:09 2010
@@ -38,7 +38,7 @@
/* For PIO/MMIO */
#include "compiler.h"
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#include "xf86Resources.h"
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
@@ -135,7 +135,7 @@
/* ??? */
#include "servermd.h"
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-vga/dist/src/generic.c
diff -u xsrc/external/mit/xf86-video-vga/dist/src/generic.c:1.3 xsrc/external/mit/xf86-video-vga/dist/src/generic.c:1.4
--- xsrc/external/mit/xf86-video-vga/dist/src/generic.c:1.3 Tue Nov 23 22:21:17 2010
+++ xsrc/external/mit/xf86-video-vga/dist/src/generic.c Wed Nov 24 02:54:09 2010
@@ -59,7 +59,7 @@
#include "xf86Resources.h"
#include "xf86int10.h"
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.8 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.9
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.8 Tue Nov 23 22:21:17 2010
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Wed Nov 24 02:54:10 2010
@@ -96,7 +96,7 @@
#define WSFB_DEFAULT_DEV "/dev/ttyC0"
#endif
-#if HAVE_XORG_SERVER_1_7_0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
#define xf86LoaderReqSymLists(...) do {} while (0)
#define LoaderRefSymLists(...) do {} while (0)
#endif
