diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-15 16:51:05 +1000 |
---|---|---|
committer | Julien Viard de Galbert <julien@vdg.blogsite.org> | 2010-03-08 15:02:11 +0100 |
commit | e79fa251feb75b710881fadf9ac57f0a188f8180 (patch) | |
tree | a3fcf0f165e49b8c9812d890691e13b072bc0eef /dix | |
parent | 898ed44ba3d296a9499f4f6d030c0b792466f3db (diff) |
Update to xextproto 7.0.99.1.
xextproto had Xlib client headers moved into libXext.
Protocol header files are named fooproto.h, header files with constants
foo.h or fooconst.h where foo.h was already in use for client-side headers.
+conflict fixing
Diffstat (limited to 'dix')
-rw-r--r-- | dix/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dix/main.c b/dix/main.c index 0527621e7..ecb356646 100644 --- a/dix/main.c +++ b/dix/main.c @@ -111,8 +111,7 @@ Equipment Corporation. #endif #ifdef DPMSExtension -#define DPMS_SERVER -#include <X11/extensions/dpms.h> +#include <X11/extensions/dpmsconst.h> #include "dpmsproc.h" #endif |