From 9673318434621e6c9c7833b47edc2cf487542491 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 01:18:13 +0200 Subject: [PATCH] (submit/selection.h) dix: rename selection.h to selection_priv.h rename it in order to reflects it's private nature (not exported). Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/xace.h | 3 ++- Xext/xacestr.h | 3 ++- Xext/xselinux_ext.c | 2 +- Xext/xselinux_hooks.c | 2 +- damageext/damageextint.h | 6 ++++-- dix/dispatch.c | 2 +- dix/main.c | 10 +++++----- dix/selection.c | 2 +- include/selection.h => dix/selection_priv.h | 0 dix/window.c | 2 +- hw/xwayland/xwayland.c | 5 ++--- xfixes/xfixesint.h | 6 ++++-- 12 files changed, 24 insertions(+), 19 deletions(-) rename include/selection.h => dix/selection_priv.h (100%) diff --git a/Xext/xace.h b/Xext/xace.h index 8026886f7..8d71c4392 100644 --- a/Xext/xace.h +++ b/Xext/xace.h @@ -25,12 +25,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XACE_MAJOR_VERSION 2 #define XACE_MINOR_VERSION 0 +#include "dix/selection_priv.h" + #include "extnsionst.h" #include "pixmap.h" #include "region.h" #include "window.h" #include "property.h" -#include "selection.h" /* Default window background */ #define XaceBackgroundNoneState(w) ((w)->forcedBG ? BackgroundPixel : None) diff --git a/Xext/xacestr.h b/Xext/xacestr.h index 6fe8eecc8..7c4276dec 100644 --- a/Xext/xacestr.h +++ b/Xext/xacestr.h @@ -20,13 +20,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _XACESTR_H #define _XACESTR_H +#include "dix/selection_priv.h" + #include "dix.h" #include "resource.h" #include "extnsionst.h" #include "window.h" #include "input.h" #include "property.h" -#include "selection.h" #include "xace.h" /* XACE_CORE_DISPATCH */ diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index d129f47ca..cba199180 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -22,9 +22,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #include "dix/dix_priv.h" +#include "dix/selection_priv.h" #include "miext/extinit_priv.h" -#include "selection.h" #include "inputstr.h" #include "windowstr.h" #include "propertyst.h" diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c index 65cb60217..f083385e9 100644 --- a/Xext/xselinux_hooks.c +++ b/Xext/xselinux_hooks.c @@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include "dix/registry_priv.h" +#include "dix/selection_priv.h" -#include "selection.h" #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" diff --git a/damageext/damageextint.h b/damageext/damageextint.h index 7a7096d27..a7e521dd6 100644 --- a/damageext/damageextint.h +++ b/damageext/damageextint.h @@ -29,13 +29,15 @@ #include #include +#include + +#include "dix/selection_priv.h" + #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include #include "windowstr.h" -#include "selection.h" #include "scrnintstr.h" #include "damage.h" #include "xfixes.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index 20466add7..532d4616b 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -110,6 +110,7 @@ Equipment Corporation. #include "dix/gc_priv.h" #include "dix/registry_priv.h" #include "dix/screenint_priv.h" +#include "dix/selection_priv.h" #include "include/resource.h" #include "miext/extinit_priv.h" #include "os/auth.h" @@ -119,7 +120,6 @@ Equipment Corporation. #include "windowstr.h" #include "dixfontstr.h" #include "gcstruct.h" -#include "selection.h" #include "colormapst.h" #include "cursorstr.h" #include "scrnintstr.h" diff --git a/dix/main.c b/dix/main.c index 7f76e6eab..78774a12d 100644 --- a/dix/main.c +++ b/dix/main.c @@ -78,15 +78,19 @@ Equipment Corporation. #include #endif +#include #include #include /* for unistd.h */ #include -#include +#include +#include +#include #include "dix/callback_priv.h" #include "dix/dix_priv.h" #include "dix/gc_priv.h" #include "dix/registry_priv.h" +#include "dix/selection_priv.h" #include "os/audit.h" #include "os/auth.h" #include "os/cmdline.h" @@ -104,10 +108,6 @@ Equipment Corporation. #include "colormap.h" #include "colormapst.h" #include "cursorstr.h" -#include "selection.h" -#include -#include -#include #include "servermd.h" #include "hotplug.h" #include "dixfont.h" diff --git a/dix/selection.c b/dix/selection.c index f0ca73624..353716291 100644 --- a/dix/selection.c +++ b/dix/selection.c @@ -49,11 +49,11 @@ SOFTWARE. #endif #include "dix/dix_priv.h" +#include "dix/selection_priv.h" #include "windowstr.h" #include "dixstruct.h" #include "dispatch.h" -#include "selection.h" #include "xace.h" /***************************************************************** diff --git a/include/selection.h b/dix/selection_priv.h similarity index 100% rename from include/selection.h rename to dix/selection_priv.h diff --git a/dix/window.c b/dix/window.c index 6bef0f1bd..67f1b6dc1 100644 --- a/dix/window.c +++ b/dix/window.c @@ -103,6 +103,7 @@ Equipment Corporation. #include "dix/colormap_priv.h" #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "dix/selection_priv.h" #include "os/auth.h" #include "misc.h" @@ -131,7 +132,6 @@ Equipment Corporation. #ifdef COMPOSITE #include "compint.h" #endif -#include "selection.h" #include "inpututils.h" #include "privates.h" #include "xace.h" diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 3dbc4967d..103c5aaeb 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -37,12 +37,13 @@ #include "dix/dix_priv.h" #include "dix/screenint_priv.h" +#include "dix/selection_priv.h" +#include "os/auth.h" #include "os/cmdline.h" #include "os/ddx_priv.h" #include "os/osdep.h" #include "os/xserver_poll.h" -#include #include #include #include @@ -53,8 +54,6 @@ #include #include -#include "os/auth.h" - #include "xwayland-screen.h" #include "xwayland-vidmode.h" diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h index 1b46915ed..c9e28cecf 100644 --- a/xfixes/xfixesint.h +++ b/xfixes/xfixesint.h @@ -51,13 +51,15 @@ #include #include +#include + +#include "dix/selection_priv.h" + #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include #include "windowstr.h" -#include "selection.h" #include "xfixes.h" extern int XFixesEventBase;