summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:01:01 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:01:01 +0000
commit926367f82972bd94a64ef76c8e036f27ca61fb14 (patch)
tree4c20359552d52c3c09f1eb113d2b0c018ba40ff6
parent40b7e438e4b441204ff47e1e25755162921d7c3e (diff)
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.XORG-6_8_99_14
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>.
-rw-r--r--Xtrans.c2
-rw-r--r--Xtransint.h2
-rw-r--r--Xtranssock.c2
-rw-r--r--transport.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/Xtrans.c b/Xtrans.c
index 1a3c49c..4c8cb14 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/xtrans/Xtrans.c,v 1.3 2004/07/17 01:13:31 alanc Exp $ */
+/* $XdotOrg: xc/lib/xtrans/Xtrans.c,v 1.4 2004/11/15 15:06:56 ago Exp $ */
/* $Xorg: Xtrans.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */
/*
diff --git a/Xtransint.h b/Xtransint.h
index 50a41cc..dad0d8a 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: Xtransint.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */
+/* $XdotOrg: xc/lib/xtrans/Xtransint.h,v 1.2 2004/04/23 18:44:27 eich Exp $ */
/* $Xorg: Xtransint.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */
/*
diff --git a/Xtranssock.c b/Xtranssock.c
index 61cb8b1..eacd807 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.3 2004/11/15 15:06:56 ago Exp $ */
+/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.6 2005/06/22 22:36:51 alanc Exp $ */
/* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */
/*
diff --git a/transport.c b/transport.c
index ff460c2..68db942 100644
--- a/transport.c
+++ b/transport.c
@@ -56,7 +56,7 @@ from The Open Group.
#endif
#ifdef XSERV_t
-#include "os.h"
+#include <X11/os.h>
#else
#include <stdlib.h>
#define xalloc(_size) malloc(_size)