From 89a9927b1e5ac416441a33b44abddf8372edfe6a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 16 Oct 2019 14:44:49 -0400 Subject: [PATCH] include: Remove now-empty site.h --- dix/devices.c | 1 - dix/dispatch.c | 1 - dix/globals.c | 1 - dix/main.c | 1 - dix/pixmap.c | 1 - hw/xfree86/common/xf86Init.c | 1 - hw/xfree86/sdksyms.sh | 1 - hw/xquartz/darwin.c | 1 - include/Makefile.am | 1 - include/meson.build | 1 - include/site.h | 55 ------------------------------------ os/access.c | 1 - os/log.c | 1 - os/xdmcp.c | 1 - 14 files changed, 68 deletions(-) delete mode 100644 include/site.h diff --git a/dix/devices.c b/dix/devices.c index 00c453980..7bf5ac072 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -59,7 +59,6 @@ SOFTWARE. #include "cursorstr.h" #include "dixstruct.h" #include "ptrveloc.h" -#include "site.h" #include "xkbsrv.h" #include "privates.h" #include "xace.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index bc44215b4..90a49dbf2 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -127,7 +127,6 @@ int ProcInitialConnection(); #include "xace.h" #include "inputstr.h" #include "xkbsrv.h" -#include "site.h" #include "client.h" #ifdef XSERVER_DTRACE diff --git a/dix/globals.c b/dix/globals.c index c0779dddc..4b8b52e29 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -55,7 +55,6 @@ SOFTWARE. #include "scrnintstr.h" #include "input.h" #include "dixfont.h" -#include "site.h" #include "dixstruct.h" #include "os.h" diff --git a/dix/main.c b/dix/main.c index afae71901..bfc8addbe 100644 --- a/dix/main.c +++ b/dix/main.c @@ -100,7 +100,6 @@ Equipment Corporation. #include "opaque.h" #include "servermd.h" #include "hotplug.h" -#include "site.h" #include "dixfont.h" #include "extnsionst.h" #include "privates.h" diff --git a/dix/pixmap.c b/dix/pixmap.c index 81ac5e2d8..ad3254cb4 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -39,7 +39,6 @@ from The Open Group. #include "dixstruct.h" #include "gcstruct.h" #include "servermd.h" -#include "site.h" #include "X11/extensions/render.h" #include "picturestr.h" #include "randrstr.h" diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 2b1d7ed96..6cc2f0b01 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -51,7 +51,6 @@ #include "servermd.h" #include "windowstr.h" #include "scrnintstr.h" -#include "site.h" #include "mi.h" #include "dbus-core.h" #include "systemd-logind.h" diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index e41089297..4a13ca28d 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -278,7 +278,6 @@ cat > sdksyms.c << EOF #include "scrnintstr.h" #include "selection.h" #include "servermd.h" -#include "site.h" #include "validate.h" #include "window.h" #include "windowstr.h" diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 2826fd6b0..7bfbb767e 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -41,7 +41,6 @@ #include "mipointer.h" // mi software cursor #include "micmap.h" // mi colormap code #include "fb.h" // fb framebuffer code -#include "site.h" #include "globals.h" #include "dix.h" #include "xkbsrv.h" diff --git a/include/Makefile.am b/include/Makefile.am index c52734cf0..bf066a61a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -52,7 +52,6 @@ sdk_HEADERS = \ scrnintstr.h \ selection.h \ servermd.h \ - site.h \ validate.h \ displaymode.h \ window.h \ diff --git a/include/meson.build b/include/meson.build index 661624a01..9ecfd15a4 100644 --- a/include/meson.build +++ b/include/meson.build @@ -470,7 +470,6 @@ if build_xorg 'scrnintstr.h', 'selection.h', 'servermd.h', - 'site.h', 'validate.h', 'displaymode.h', 'window.h', diff --git a/include/site.h b/include/site.h deleted file mode 100644 index 02e33418a..000000000 --- a/include/site.h +++ /dev/null @@ -1,55 +0,0 @@ -/************************************************************ - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -********************************************************/ - -#ifndef SITE_H -#define SITE_H - -/* - * The following constants contain default values for all of the variables - * that can be initialized on the server command line or in the environment. - */ - -#endif /* SITE_H */ diff --git a/os/access.c b/os/access.c index ee432ebd5..bffb3eb6b 100644 --- a/os/access.c +++ b/os/access.c @@ -94,7 +94,6 @@ SOFTWARE. #include #include #include "misc.h" -#include "site.h" #include #include #ifndef WIN32 diff --git a/os/log.c b/os/log.c index 0e5c06b2d..456f05c32 100644 --- a/os/log.c +++ b/os/log.c @@ -88,7 +88,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include #include "input.h" -#include "site.h" #include "opaque.h" #ifdef WIN32 diff --git a/os/xdmcp.c b/os/xdmcp.c index 38f81566c..093e30096 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -43,7 +43,6 @@ #include "input.h" #include "dixstruct.h" #include "opaque.h" -#include "site.h" #define XSERV_t #define TRANS_SERVER