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 <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1351>

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"

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"

composite/compinit.c

@@ -45,6 +45,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "compint.h"
 #include "compositeext.h"
 

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 */

dix/main.c

@@ -108,7 +108,6 @@ Equipment Corporation.
 #include <X11/fonts/font.h>
 #include <X11/fonts/fontstruct.h>
 #include <X11/fonts/libxfont2.h>
-#include "opaque.h"
 #include "servermd.h"
 #include "hotplug.h"
 #include "dixfont.h"

glx/vndext.c

@@ -40,6 +40,8 @@
 #include <GL/glxproto.h>
 #include "vndservervendor.h"
 
+#include "dix/dix_priv.h"
+
 ExtensionEntry *GlxExtensionEntry;
 int GlxErrorBase = 0;
 static CallbackListRec vndInitCallbackList;

hw/vfb/InitOutput.c

@@ -38,6 +38,7 @@ from The Open Group.
 #include <X11/Xproto.h>
 #include <X11/Xos.h>
 
+#include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"

hw/xfree86/common/xf86Events.c

@@ -58,6 +58,8 @@
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
 
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "xf86.h"
 #include "xf86Priv.h"

hw/xfree86/common/xf86Helper.c

@@ -41,6 +41,8 @@
 #include <sys/stat.h>
 #include <X11/X.h>
 
+#include "dix/dix_priv.h"
+
 #include "mi.h"
 #include "os.h"
 #include "servermd.h"

hw/xwayland/xwayland-window.c

@@ -34,6 +34,8 @@
 #include <X11/X.h>
 #include <X11/Xatom.h>
 
+#include "dix/dix_priv.h"
+
 #include "compositeext.h"
 #include "compint.h"
 #include "inputstr.h"

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"

hw/xwin/wincreatewnd.c

@@ -31,6 +31,9 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+
+#include "dix/dix_priv.h"
+
 #include "win.h"
 #include "shellapi.h"
 

hw/xwin/windisplay.c

@@ -30,6 +30,8 @@
 #endif
 
 #include <opaque.h>             // for display
+#include "dix/dix_priv.h"       // for display
+
 #include "windisplay.h"
 #include "winmsg.h"
 

hw/xwin/wintrayicon.c

@@ -38,6 +38,8 @@
 #include "winprefs.h"
 #include "winclipboard/winclipboard.h"
 
+#include "dix/dix_priv.h"
+
 /*
  * Initialize the tray icon
  */

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;

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

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"
 

os/log.c

@@ -87,6 +87,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <time.h>
 #include <X11/Xos.h>
 
+#include "dix/dix_priv.h"
 #include "os/audit.h"
 #include "os/ddx_priv.h"
 #include "os/fmt.h"

os/osinit.c

@@ -60,6 +60,7 @@ SOFTWARE.
 #include <execinfo.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "os/busfault.h"
 #include "os/osdep.h"
 

os/xdmcp.c

@@ -40,6 +40,7 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
+#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

randr/rrproperty.c

@@ -19,11 +19,15 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include <X11/Xatom.h>
+
+#include "dix/dix_priv.h"
 
 #include "randrstr_priv.h"
 #include "propertyst.h"
 #include "swaprep.h"
-#include <X11/Xatom.h>
 
 static int
 DeliverPropertyEvent(WindowPtr pWin, void *value)

randr/rrproviderproperty.c

@@ -19,6 +19,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include "dix/dix_priv.h"
 
 #include "randrstr_priv.h"
 #include "propertyst.h"

xfixes/disconnect.c

@@ -49,7 +49,6 @@
 #include "dix/dix_priv.h"
 
 #include "xfixesint.h"
-#include "opaque.h"
 
 static DevPrivateKeyRec ClientDisconnectPrivateKeyRec;
 

xkb/ddxLoad.c

@@ -40,6 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XKM.h>
 
+#include "dix/dix_priv.h"
 #include "os/osdep.h"
 
 #include "inputstr.h"