diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:55:05 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:55:05 +1000 |
| commit | 841df790b5b6700e9a1d6d41ee04b0b913329084 (patch) | |
| tree | 2d884f27ebc5bc6141993608c81d28786fc12bd0 | |
| parent | d754e9a2954e56a26a94e58d87a450a825c250e6 (diff) | |
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/smi_501.c | 5 | ||||
| -rw-r--r-- | src/smi_driver.c | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index ec0e99e..e38433e 100644 --- a/configure.ac +++ b/configure.ac @@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $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") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff --git a/src/smi_501.c b/src/smi_501.c index a392eb0..a605e0d 100644 --- a/src/smi_501.c +++ b/src/smi_501.c @@ -35,8 +35,13 @@ authorization from The XFree86 Project or Silicon Motion. #include "smi_501.h" #include "regsmi.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + /* Want to see register dumps for now */ #undef VERBLEV diff --git a/src/smi_driver.c b/src/smi_driver.c index b47f774..b9b7b18 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -43,8 +43,13 @@ authorization from The XFree86 Project or Silicon Motion. #include "smi_crtc.h" #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + /* * Internals |