From 06b599edb65c171c4104e4b0977b9be0130f03e8 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 1 Mar 2024 18:52:58 +0100 Subject: [PATCH] dix: unexport fields from opaque.h not used by modules/drivers Lots of fields from opaque.h aren't used by any drivers/modules and thus don't need to be exported at all. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- Xext/saver.c | 1 - Xext/sync.c | 1 - composite/compinit.c | 2 ++ dix/dix_priv.h | 22 ++++++++++++++++++++++ dix/main.c | 1 - glx/vndext.c | 2 ++ hw/vfb/InitOutput.c | 1 + hw/xfree86/common/xf86Events.c | 2 ++ hw/xfree86/common/xf86Helper.c | 2 ++ hw/xwayland/xwayland-window.c | 2 ++ hw/xwin/InitOutput.c | 2 ++ hw/xwin/wincreatewnd.c | 3 +++ hw/xwin/windisplay.c | 2 ++ hw/xwin/wintrayicon.c | 2 ++ include/opaque.h | 18 ------------------ os/WaitFor.c | 2 +- os/connection.c | 1 - os/log.c | 1 + os/osinit.c | 1 + os/xdmcp.c | 2 +- randr/rrproperty.c | 6 +++++- randr/rrproviderproperty.c | 3 +++ xfixes/disconnect.c | 1 - xkb/ddxLoad.c | 1 + 24 files changed, 55 insertions(+), 26 deletions(-) diff --git a/Xext/saver.c b/Xext/saver.c index 5d0098c40..819aafbea 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -45,7 +45,6 @@ in this Software without prior written authorization from the X Consortium. #include "extnsionst.h" #include "dixstruct.h" #include "resource.h" -#include "opaque.h" #include "gcstruct.h" #include "cursorstr.h" #include "colormapst.h" diff --git a/Xext/sync.c b/Xext/sync.c index a37444bb0..c71d919c1 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -68,7 +68,6 @@ PERFORMANCE OF THIS SOFTWARE. #include "dixstruct.h" #include "pixmapstr.h" #include "resource.h" -#include "opaque.h" #include "syncsrv.h" #include "syncsdk.h" #include "protocol-versions.h" diff --git a/composite/compinit.c b/composite/compinit.c index 7e324afdc..ecb36897d 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -45,6 +45,8 @@ #include #endif +#include "dix/dix_priv.h" + #include "compint.h" #include "compositeext.h" diff --git a/dix/dix_priv.h b/dix/dix_priv.h index f82188cd9..8a85ed35d 100644 --- a/dix/dix_priv.h +++ b/dix/dix_priv.h @@ -231,4 +231,26 @@ int CorePointerProc(DeviceIntPtr dev, int what); int CoreKeyboardProc(DeviceIntPtr dev, int what); +extern Bool whiteRoot; + +extern volatile char isItTimeToYield; + +/* bit values for dispatchException */ +#define DE_RESET 1 +#define DE_TERMINATE 2 +#define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */ + +extern volatile char dispatchException; + +extern int ScreenSaverBlanking; +extern int ScreenSaverAllowExposures; +extern int defaultScreenSaverBlanking; +extern int defaultScreenSaverAllowExposures; +extern const char *display; +extern int displayfd; +extern Bool explicit_display; + +extern Bool disableBackingStore; +extern Bool enableBackingStore; + #endif /* _XSERVER_DIX_PRIV_H */ diff --git a/dix/main.c b/dix/main.c index 86bc54180..58fd6b3d2 100644 --- a/dix/main.c +++ b/dix/main.c @@ -108,7 +108,6 @@ Equipment Corporation. #include #include #include -#include "opaque.h" #include "servermd.h" #include "hotplug.h" #include "dixfont.h" diff --git a/glx/vndext.c b/glx/vndext.c index 92b3001a3..a0519ff65 100644 --- a/glx/vndext.c +++ b/glx/vndext.c @@ -40,6 +40,8 @@ #include #include "vndservervendor.h" +#include "dix/dix_priv.h" + ExtensionEntry *GlxExtensionEntry; int GlxErrorBase = 0; static CallbackListRec vndInitCallbackList; diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index b052e52fe..c82295eb8 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -38,6 +38,7 @@ from The Open Group. #include #include +#include "dix/dix_priv.h" #include "dix/screenint_priv.h" #include "os/cmdline.h" #include "os/ddx_priv.h" diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 23c492915..d61072ab8 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -58,6 +58,8 @@ #include #include +#include "dix/dix_priv.h" + #include "misc.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 85bd3bb33..34fece99d 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -41,6 +41,8 @@ #include #include +#include "dix/dix_priv.h" + #include "mi.h" #include "os.h" #include "servermd.h" diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c index c2bd792e4..05fdd5b4e 100644 --- a/hw/xwayland/xwayland-window.c +++ b/hw/xwayland/xwayland-window.c @@ -34,6 +34,8 @@ #include #include +#include "dix/dix_priv.h" + #include "compositeext.h" #include "compint.h" #include "inputstr.h" diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 4d0bbdfa3..541503552 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -68,6 +68,8 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner, #include "extinit_priv.h" #include "pseudoramiX/pseudoramiX.h" +#include "dix/dix_priv.h" + #include "glx_extinit.h" #ifdef XWIN_GLX_WINDOWS #include "glx/glwindows.h" diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index e3238ae76..58247675f 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -31,6 +31,9 @@ #ifdef HAVE_XWIN_CONFIG_H #include #endif + +#include "dix/dix_priv.h" + #include "win.h" #include "shellapi.h" diff --git a/hw/xwin/windisplay.c b/hw/xwin/windisplay.c index 17f0c7789..52ece1d88 100644 --- a/hw/xwin/windisplay.c +++ b/hw/xwin/windisplay.c @@ -30,6 +30,8 @@ #endif #include // for display +#include "dix/dix_priv.h" // for display + #include "windisplay.h" #include "winmsg.h" diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c index 5d1e6aefa..7da170d27 100644 --- a/hw/xwin/wintrayicon.c +++ b/hw/xwin/wintrayicon.c @@ -38,6 +38,8 @@ #include "winprefs.h" #include "winclipboard/winclipboard.h" +#include "dix/dix_priv.h" + /* * Initialize the tray icon */ diff --git a/include/opaque.h b/include/opaque.h index a89be06a7..048a1c946 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -34,24 +34,7 @@ from The Open Group. #include "globals.h" extern _X_EXPORT int LimitClients; -extern _X_EXPORT volatile char isItTimeToYield; -extern _X_EXPORT volatile char dispatchException; -/* bit values for dispatchException */ -#define DE_RESET 1 -#define DE_TERMINATE 2 -#define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */ - -extern _X_EXPORT int ScreenSaverBlanking; -extern _X_EXPORT int ScreenSaverAllowExposures; -extern _X_EXPORT int defaultScreenSaverBlanking; -extern _X_EXPORT int defaultScreenSaverAllowExposures; -extern _X_EXPORT const char *display; -extern _X_EXPORT int displayfd; -extern _X_EXPORT Bool explicit_display; - -extern _X_EXPORT Bool disableBackingStore; -extern _X_EXPORT Bool enableBackingStore; extern _X_EXPORT Bool enableIndirectGLX; extern _X_EXPORT Bool PartialNetwork; extern _X_EXPORT Bool RunFromSigStopParent; @@ -66,7 +49,6 @@ extern _X_EXPORT int limitStackSpace; extern _X_EXPORT int limitNoFile; #endif extern _X_EXPORT Bool defeatAccessControl; -extern _X_EXPORT Bool whiteRoot; extern _X_EXPORT Bool bgNoneRoot; extern _X_EXPORT Bool CoreDump; diff --git a/os/WaitFor.c b/os/WaitFor.c index ea84570b1..fbafa5ab0 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -70,7 +70,7 @@ SOFTWARE. #include "misc.h" #include "osdep.h" #include "dixstruct_priv.h" -#include "opaque.h" +#include "globals.h" #ifdef DPMSExtension #include "dpmsproc.h" #endif diff --git a/os/connection.c b/os/connection.c index 425e692cf..c47cf6ea7 100644 --- a/os/connection.c +++ b/os/connection.c @@ -102,7 +102,6 @@ SOFTWARE. #include "os/osdep.h" #include "misc.h" /* for typedef of pointer */ -#include "opaque.h" #include "dixstruct_priv.h" #include "xace.h" diff --git a/os/log.c b/os/log.c index 0f62f864e..9a702122b 100644 --- a/os/log.c +++ b/os/log.c @@ -87,6 +87,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include #include +#include "dix/dix_priv.h" #include "os/audit.h" #include "os/ddx_priv.h" #include "os/fmt.h" diff --git a/os/osinit.c b/os/osinit.c index c01466aa0..01bb21743 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -60,6 +60,7 @@ SOFTWARE. #include #endif +#include "dix/dix_priv.h" #include "os/busfault.h" #include "os/osdep.h" diff --git a/os/xdmcp.c b/os/xdmcp.c index 603949807..7546d8309 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -40,6 +40,7 @@ #include #include +#include "dix/dix_priv.h" #include "os/auth.h" #include "misc.h" @@ -48,7 +49,6 @@ #include "xdmauth.h" #include "input.h" #include "dixstruct.h" -#include "opaque.h" #define XSERV_t #define TRANS_SERVER diff --git a/randr/rrproperty.c b/randr/rrproperty.c index 327a0656c..6f8cbb8bb 100644 --- a/randr/rrproperty.c +++ b/randr/rrproperty.c @@ -19,11 +19,15 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include + +#include + +#include "dix/dix_priv.h" #include "randrstr_priv.h" #include "propertyst.h" #include "swaprep.h" -#include static int DeliverPropertyEvent(WindowPtr pWin, void *value) diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c index 7f22c7e34..d26cf598d 100644 --- a/randr/rrproviderproperty.c +++ b/randr/rrproviderproperty.c @@ -19,6 +19,9 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include + +#include "dix/dix_priv.h" #include "randrstr_priv.h" #include "propertyst.h" diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c index e412942b1..e2140572a 100644 --- a/xfixes/disconnect.c +++ b/xfixes/disconnect.c @@ -49,7 +49,6 @@ #include "dix/dix_priv.h" #include "xfixesint.h" -#include "opaque.h" static DevPrivateKeyRec ClientDisconnectPrivateKeyRec; diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 18e0ec3be..3aafab90e 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -40,6 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include +#include "dix/dix_priv.h" #include "os/osdep.h" #include "inputstr.h"