summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-07-17 16:05:09 +1000
committerDave Airlie <airlied@redhat.com>2012-07-17 16:47:03 +1000
commit86e83109d6309455e505d636e7760942177b1519 (patch)
treeacdb9d0829c32b87fc768cacb18b9193f3064514
parente5e3e733d933fc3accdd6c3c7a02df5950530cae (diff)
xf86-video-nv: bump to version 2.1.19
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--configure.ac2
-rw-r--r--src/compat-api.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 05d34f9..e201b12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-nv],
- [2.1.18],
+ [2.1.19],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-nv])
AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/src/compat-api.h b/src/compat-api.h
index 98ba435..0a87cf5 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -46,7 +46,7 @@
#define SCREEN_ARG_TYPE int
#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv
#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask