mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-08 21:58:05 +02:00
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>.
This commit is contained in:
Daniel Stone
parent
197697c92a
commit
8c7677138e
15 changed files with 27 additions and 11 deletions
|
|
@ -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 $ */
|
||||
/*
|
||||
|
||||
|
|
|
|||
|
|
@ -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 $ */
|
||||
/*
|
||||
|
||||
|
|
|
|||
|
|
@ -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 $
|
||||
*/
|
||||
|
||||
/***********************************************************
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 $ */
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 $ */
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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 $ */
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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 <dix-config.h>
|
||||
#endif
|
||||
|
||||
#ifndef XKB_IN_SERVER
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
|
|||
|
|
@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#define NEED_EVENTS
|
||||
#define NEED_REPLIES
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#ifndef XKB_IN_SERVER
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
|
|||
|
|
@ -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 <dix-config.h>
|
||||
#endif
|
||||
|
||||
#ifndef XKB_IN_SERVER
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
|
|||
|
|
@ -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 <dix-config.h>
|
||||
#endif
|
||||
|
||||
#ifndef XKB_IN_SERVER
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <config.h>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue