summaryrefslogtreecommitdiff
path: root/record
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 /record
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 'record')
-rw-r--r--record/record.c4
-rw-r--r--record/set.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/record/record.c b/record/record.c
index 55ae6934c..5809e0086 100644
--- a/record/record.c
+++ b/record/record.c
@@ -36,6 +36,10 @@ and Jim Haggerty of Metheus.
/* $XFree86: xc/programs/Xserver/record/record.c,v 1.11 2003/11/03 05:12:01 tsi Exp $ */
#define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include "dixstruct.h"
#include "extnsionst.h"
#define _XRECORD_SERVER_
diff --git a/record/set.c b/record/set.c
index a239e4af0..3b494e74b 100644
--- a/record/set.c
+++ b/record/set.c
@@ -51,6 +51,10 @@ from The Open Group.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef TESTING
#include <X11/misc.h>
#else