diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:40:15 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-18 12:10:18 +1000 |
| commit | 0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890 (patch) | |
| tree | 976dd107999f66b46b82a6d1d006a4b72749b153 /src | |
| parent | 57c7cbade9556e7b21867e61353f0928fd553616 (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.
SHM is now shm.h instead of shmstr. Requires definition of ShmFuncs that's
not exported by the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ch7017/ch7017.c | 5 | ||||
| -rw-r--r-- | src/ch7xxx/ch7xxx.c | 5 | ||||
| -rw-r--r-- | src/ivch/ivch.c | 5 | ||||
| -rw-r--r-- | src/sil164/sil164.c | 5 | ||||
| -rw-r--r-- | src/tfp410/tfp410.c | 5 |
5 files changed, 25 insertions, 0 deletions
diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c index 759fc24b..01e414f0 100644 --- a/src/ch7017/ch7017.c +++ b/src/ch7017/ch7017.c @@ -39,8 +39,13 @@ #include "miscstruct.h" #include "xf86i2c.h" #include "xf86Crtc.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "../i2c_vid.h" #include "ch7017_reg.h" diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c index 8a439e42..13ba1020 100644 --- a/src/ch7xxx/ch7xxx.c +++ b/src/ch7xxx/ch7xxx.c @@ -39,8 +39,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "miscstruct.h" #include "xf86i2c.h" #include "xf86Crtc.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "../i2c_vid.h" #include "ch7xxx.h" diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c index 873afcc9..dffe334a 100644 --- a/src/ivch/ivch.c +++ b/src/ivch/ivch.c @@ -36,8 +36,13 @@ #include "miscstruct.h" #include "xf86i2c.h" #include "xf86Crtc.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <unistd.h> #include "../i2c_vid.h" diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c index 410a681f..c90bed32 100644 --- a/src/sil164/sil164.c +++ b/src/sil164/sil164.c @@ -40,8 +40,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "miscstruct.h" #include "xf86i2c.h" #include "xf86Crtc.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "../i2c_vid.h" #include "sil164.h" diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c index c2c4fc3d..4d3bb8ad 100644 --- a/src/tfp410/tfp410.c +++ b/src/tfp410/tfp410.c @@ -39,8 +39,13 @@ #include "miscstruct.h" #include "xf86i2c.h" #include "xf86Crtc.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "../i2c_vid.h" #include "tfp410.h" |