From 8c7677138e70e14eca0255f2168583f0ecc21994 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sun, 3 Jul 2005 07:00:55 +0000 Subject: [PATCH] Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings. Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. Add #include or , 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 . --- include/X11/Xlib.h | 2 +- src/ConnDis.c | 2 +- src/ErrDes.c | 2 +- src/Host.c | 2 +- src/LiHosts.c | 2 +- src/SetLocale.c | 2 +- src/util/makekeys.c | 2 +- src/xcms/HVC.c | 2 +- src/xcms/cmsColNm.c | 2 +- src/xkb/XKBAlloc.c | 4 ++++ src/xkb/XKBGAlloc.c | 4 ++++ src/xkb/XKBMAlloc.c | 4 ++++ src/xkb/XKBMisc.c | 4 ++++ src/xkb/XKBSetGeom.c | 2 +- src/xlibi18n/XlcDL.c | 2 +- 15 files changed, 27 insertions(+), 11 deletions(-) diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index 1cae2afc..bb2aaa2b 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.4 2005-05-17 08:10:10 eich Exp $ */ +/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.5 2005-07-03 07:00:55 daniels Exp $ */ /* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */ /* diff --git a/src/ConnDis.c b/src/ConnDis.c index d676cb17..b636f00f 100644 --- a/src/ConnDis.c +++ b/src/ConnDis.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.9 2005-06-09 15:52:02 ago Exp $ */ +/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.10 2005-07-03 07:00:55 daniels Exp $ */ /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */ /* diff --git a/src/ErrDes.c b/src/ErrDes.c index f45b9e29..f6853f76 100644 --- a/src/ErrDes.c +++ b/src/ErrDes.c @@ -1,6 +1,6 @@ /* * $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ - * $XdotOrg: lib/X11/src/ErrDes.c,v 1.6 2005-05-13 22:53:43 sandmann Exp $ + * $XdotOrg: lib/X11/src/ErrDes.c,v 1.7 2005-07-03 07:00:55 daniels Exp $ */ /*********************************************************** diff --git a/src/Host.c b/src/Host.c index 5a76c50c..a1ca8701 100644 --- a/src/Host.c +++ b/src/Host.c @@ -1,5 +1,5 @@ /* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/Host.c,v 1.3 2005-05-13 22:53:43 sandmann Exp $ */ +/* $XdotOrg: lib/X11/src/Host.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */ /* Copyright 1986, 1998 The Open Group diff --git a/src/LiHosts.c b/src/LiHosts.c index a455b671..b7a6d405 100644 --- a/src/LiHosts.c +++ b/src/LiHosts.c @@ -1,5 +1,5 @@ /* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ +/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */ /* Copyright 1986, 1998 The Open Group diff --git a/src/SetLocale.c b/src/SetLocale.c index c24a381c..6730338b 100644 --- a/src/SetLocale.c +++ b/src/SetLocale.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ +/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */ /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* diff --git a/src/util/makekeys.c b/src/util/makekeys.c index fad29e38..4f7a2234 100644 --- a/src/util/makekeys.c +++ b/src/util/makekeys.c @@ -1,5 +1,5 @@ /* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 $ */ -/* $XdotOrg: lib/X11/src/util/makekeys.c,v 1.4 2004-09-26 20:46:17 kuhn Exp $ */ +/* $XdotOrg: lib/X11/src/util/makekeys.c,v 1.5 2005-07-03 07:00:56 daniels Exp $ */ /* Copyright 1990, 1998 The Open Group diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c index ed446bfd..80942623 100644 --- a/src/xcms/HVC.c +++ b/src/xcms/HVC.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.3 2005-05-13 22:53:43 sandmann Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */ /* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ /* diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c index cf1286d7..87f26527 100644 --- a/src/xcms/cmsColNm.c +++ b/src/xcms/cmsColNm.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */ /* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ /* diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c index cc85b8f9..c415380e 100644 --- a/src/xkb/XKBAlloc.c +++ b/src/xkb/XKBAlloc.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.5 2001/01/17 19:41:48 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c index a1c0d1be..d5b9a1c9 100644 --- a/src/xkb/XKBGAlloc.c +++ b/src/xkb/XKBGAlloc.c @@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c index 9fe33e7d..db002069 100644 --- a/src/xkb/XKBMAlloc.c +++ b/src/xkb/XKBMAlloc.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c index 987c6e33..6ad36412 100644 --- a/src/xkb/XKBMisc.c +++ b/src/xkb/XKBMisc.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/src/xkb/XKBSetGeom.c b/src/xkb/XKBSetGeom.c index 912f7ebd..e0706235 100644 --- a/src/xkb/XKBSetGeom.c +++ b/src/xkb/XKBSetGeom.c @@ -1,5 +1,5 @@ /* $Xorg: XKBSetGeom.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */ -/* $XdotOrg: lib/X11/src/xkb/XKBSetGeom.c,v 1.4 2005-05-13 22:53:44 sandmann Exp $ */ +/* $XdotOrg: lib/X11/src/xkb/XKBSetGeom.c,v 1.5 2005-07-03 07:00:55 daniels Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c index 6bdd4818..8425fe4b 100644 --- a/src/xlibi18n/XlcDL.c +++ b/src/xlibi18n/XlcDL.c @@ -42,7 +42,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86: xc/lib/X11/XlcDL.c,v 1.12 2003/04/13 19:22:19 dawes Exp $ */ -/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ +/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */ #ifdef HAVE_CONFIG_H #include