From 0c87d592ef85f0973f464e9da251bcb07c622788 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 15 Feb 2024 18:57:36 +0100 Subject: [PATCH] Xnest: drop xnest-config.h Xnest now is the only consumer of xnest-config.h, but here dix-config is enough (doesn't use anything from xkb-config.h), so this file can be dropped now. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/Args.c | 2 +- hw/xnest/Color.c | 2 +- hw/xnest/Cursor.c | 2 +- hw/xnest/Display.c | 2 +- hw/xnest/Events.c | 2 +- hw/xnest/Font.c | 2 +- hw/xnest/GC.c | 2 +- hw/xnest/GCOps.c | 2 +- hw/xnest/Handlers.c | 2 +- hw/xnest/Init.c | 2 +- hw/xnest/Keyboard.c | 2 +- hw/xnest/Pixmap.c | 2 +- hw/xnest/Pointer.c | 2 +- hw/xnest/Screen.c | 2 +- hw/xnest/Visual.c | 2 +- hw/xnest/Window.c | 2 +- hw/xnest/xnest-config.h | 36 ------------------------------------ 17 files changed, 16 insertions(+), 52 deletions(-) delete mode 100644 hw/xnest/xnest-config.h diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 7ee66e2ab..717f04251 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index 47e376b5b..3165193d7 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index 3ad5ec575..6ba1377e6 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index 514eef7e0..cbef01e65 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index e28ce4ca5..879ee48be 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index 2c3555990..916715877 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index 44e49ddde..fb6f5c84e 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index bb4e22478..145a605bb 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index a06f3f90d..7e5133381 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 0ae42d53a..73a84cade 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index 2093ba019..81138676d 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #ifdef WIN32 #include diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 55ea97e39..2010bfa26 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index b7cc6e8c2..671de1573 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index f5f3d7212..2e473c09e 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index 858324b2c..f2c1707f4 100644 --- a/hw/xnest/Visual.c +++ b/hw/xnest/Visual.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index 6f3fc64cb..36da689fe 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -12,7 +12,7 @@ is" without express or implied warranty. */ -#include +#include #include #include diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h deleted file mode 100644 index ef48c580f..000000000 --- a/hw/xnest/xnest-config.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2005 Red Hat Inc., Raleigh, North Carolina. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation on the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) 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 - * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS - * 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. - */ - -#ifndef XNEST_CONFIG_H -#define XNEST_CONFIG_H - -#include -#include - -#undef MITSHM - -#endif /* XNEST_CONFIG_H */