summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-10-29 17:25:18 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-29 17:25:18 -0700
commit03644653d051e4f5b8498c790626a9bed2756a89 (patch)
treef8994509e4029d5b9d83d36cd9a84b83452e9a26
parent4b0aab53a1e8500578f86178761f4c805b2a5990 (diff)
Silence warnings by using newer xf86dgaproto
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--configure.ac2
-rw-r--r--src/sis_driver.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 8920c6f..f8d09af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto >= 2.1 $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
diff --git a/src/sis_driver.c b/src/sis_driver.c
index e19bfff..a8af80c 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -74,8 +74,7 @@
#include "sis_driver.h"
-#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/xf86dgaproto.h>
#include "globals.h"