summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:00:56 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:00:56 +0000
commit1df326ab00b3ca1faf44d81ce53f6b66076ad0cf (patch)
tree33e383a4c77e010d2fd2057ec014db4e8dc98979
parent77283d94174d18791e230b4800641242c1767e87 (diff)
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--Wrap.h2
-rw-r--r--include/X11/Xdmcp.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Wrap.h b/Wrap.h
index 0b218ca..9c57e1d 100644
--- a/Wrap.h
+++ b/Wrap.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/Xdmcp/Wrap.h,v 1.4 2004/08/21 02:06:44 jg Exp $ */
+/* $XdotOrg: xc/lib/Xdmcp/Wrap.h,v 1.5 2004/08/22 01:02:25 jg Exp $ */
/* $Xorg: Wrap.h,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ */
/*
* header file for compatibility with something useful
diff --git a/include/X11/Xdmcp.h b/include/X11/Xdmcp.h
index 9c40619..2548485 100644
--- a/include/X11/Xdmcp.h
+++ b/include/X11/Xdmcp.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
+/* $XdotOrg: xc/lib/Xdmcp/Xdmcp.h,v 1.2 2004/04/23 18:43:41 eich Exp $ */
/* $Xorg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
/*
* Copyright 1989 Network Computing Devices, Inc., Mountain View, California.