summaryrefslogtreecommitdiff
path: root/randr
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
commite03198972ca78b03ad13cb49112c03a052bb763b (patch)
tree1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /randr
parentb8aef6c474ffc6d637bec178674898ea95ccde47 (diff)
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all source files in the xserver/xorg tree, predicated on defines of HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to <X11/fonts/foo.h>.
Diffstat (limited to 'randr')
-rw-r--r--randr/mirandr.c4
-rw-r--r--randr/randr.c4
-rw-r--r--randr/randrstr.h4
3 files changed, 12 insertions, 0 deletions
diff --git a/randr/mirandr.c b/randr/mirandr.c
index ac29485bb..b1e19a746 100644
--- a/randr/mirandr.c
+++ b/randr/mirandr.c
@@ -25,6 +25,10 @@
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include "scrnintstr.h"
#include "mi.h"
#include <X11/extensions/randr.h>
diff --git a/randr/randr.c b/randr/randr.c
index db9c57601..f63abcb20 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -27,6 +27,10 @@
#define NEED_REPLIES
#define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/misc.h>
diff --git a/randr/randrstr.h b/randr/randrstr.h
index eecadd7b5..cd4ce3846 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef _RANDRSTR_H_
#define _RANDRSTR_H_