From 725f14b2a2df1c7b9dcf43c21f218cc7093e7595 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 27 Feb 2024 16:14:01 +0100 Subject: [PATCH] (submit/unexport-ddx-callbacks) os: rename ddx.h to ddx_priv.h Make it clear that stuff from this file really isn't supposed to be used by dynamically loaded modules like drivers. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/dispatch.c | 1 - dix/main.c | 1 - hw/kdrive/ephyr/ephyrinit.c | 1 - hw/vfb/InitOutput.c | 1 - hw/xfree86/common/xf86Configure.c | 1 - hw/xnest/Args.c | 1 - hw/xnest/Init.c | 1 - hw/xquartz/darwin.c | 1 - hw/xwayland/xwayland.c | 1 - hw/xwin/winprocarg.c | 2 +- meson.build | 1 - os/ddx.h | 27 --------------------------- os/inputthread.c | 1 + os/log.c | 1 - os/utils.c | 1 - 15 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 os/ddx.h diff --git a/dix/dispatch.c b/dix/dispatch.c index d9d86374d..d09ec2697 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -122,7 +122,6 @@ Equipment Corporation. #include "os/screensaver.h" #include "windowstr.h" -#include "ddx.h" #include "dixfontstr.h" #include "gcstruct.h" #include "cursorstr.h" diff --git a/dix/main.c b/dix/main.c index 8423a15f3..cf83a6346 100644 --- a/dix/main.c +++ b/dix/main.c @@ -111,7 +111,6 @@ Equipment Corporation. #include "extension.h" #include "cursorstr.h" #include "servermd.h" -#include "ddx.h" #include "dixfont.h" #include "extnsionst.h" #include "privates.h" diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 742f98ac1..9306f3367 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -30,7 +30,6 @@ #include "os/ddx_priv.h" #include "os/osdep.h" -#include "ddx.h" #include "ephyr.h" #include "ephyrlog.h" #include "glx_extinit.h" diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index daf02ccf9..cd3b2e0a8 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -70,7 +70,6 @@ from The Open Group. #include #include #endif /* MITSHM */ -#include "ddx.h" #include "dix.h" #include "miline.h" #include "glx_extinit.h" diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 1158bc409..6242cad50 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -32,7 +32,6 @@ #include "os/ddx_priv.h" #include "os/osdep.h" -#include "ddx.h" #include "xf86.h" #include "xf86Config.h" #include "xf86_OSlib.h" diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 0fe74d83c..fb6371815 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -25,7 +25,6 @@ is" without express or implied warranty. #include "misc.h" #include "scrnintstr.h" #include "servermd.h" -#include "os/ddx.h" #include "xnest-xcb.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index c4f5b9e4a..ffa94b075 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -26,7 +26,6 @@ is" without express or implied warranty. #include "os/ddx_priv.h" #include "os/osdep.h" -#include "ddx.h" #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 45e279444..8b6c3c2ee 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -46,7 +46,6 @@ #include "micmap.h" // mi colormap code #include "fb.h" // fb framebuffer code #include "globals.h" -#include "ddx.h" #include "dix.h" #include "xkbsrv.h" diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index cb540b89f..99cc68010 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -53,7 +53,6 @@ #include #include #include -#include "ddx.h" #include #include #include "extinit.h" diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index ed6a91328..a90253b3b 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -36,6 +36,7 @@ from The Open Group. #endif #include "os/cmdline.h" +#include "os/ddx_priv.h" #include "os/osdep.h" #include "os/ddx_priv.h" @@ -47,7 +48,6 @@ from The Open Group. #include "winprefs.h" #include "winclipboard/winclipboard.h" -#include "ddx.h" /* * Function prototypes diff --git a/meson.build b/meson.build index b66b6b0fa..93f20c97a 100644 --- a/meson.build +++ b/meson.build @@ -671,7 +671,6 @@ inc = include_directories( 'dix', 'dri3', 'include', - 'os', 'present', 'randr', 'render', diff --git a/os/ddx.h b/os/ddx.h deleted file mode 100644 index 1f90e099d..000000000 --- a/os/ddx.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: MIT OR X11 - * - * Copyright © 2024 Enrico Weigelt, metux IT consult - */ -#ifndef _XSERVER_OS_DDX_H -#define _XSERVER_OS_DDX_H - -#include "os.h" - -/* callbacks of the DDX, which are called by DIX or OS layer. - DDX's need to implement these in order to handle DDX specific things. -*/ - -/* called before server reset */ -void ddxBeforeReset(void); - -/* called by ProcessCommandLine, so DDX can catch cmdline args */ -int ddxProcessArgument(int argc, char *argv[], int i); - -/* print DDX specific usage message */ -void ddxUseMsg(void); - -void ddxGiveUp(enum ExitCode error); - -void ddxInputThreadInit(void); - -#endif /* _XSERVER_OS_DDX_H */ diff --git a/os/inputthread.c b/os/inputthread.c index b877c3b2f..34a976a7c 100644 --- a/os/inputthread.c +++ b/os/inputthread.c @@ -33,6 +33,7 @@ #include #include +#include "os/ddx_priv.h" #include "dix/input_priv.h" #include "os/ddx_priv.h" diff --git a/os/log.c b/os/log.c index 8f74a5eb9..69b0bb6ca 100644 --- a/os/log.c +++ b/os/log.c @@ -97,7 +97,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "os/osdep.h" #include "opaque.h" -#include "ddx.h" #ifdef XF86BIGFONT #include "xf86bigfontsrv.h" diff --git a/os/utils.c b/os/utils.c index 4b97fe6eb..528ea90ab 100644 --- a/os/utils.c +++ b/os/utils.c @@ -118,7 +118,6 @@ __stdcall unsigned long GetTickCount(void); #include "dixstruct.h" #include "picture.h" #include "miinitext.h" -#include "ddx.h" #include "present.h" #include "dixstruct_priv.h" #include "dpmsproc.h"