HACK

It's not used by any module/driver, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/panoramiXprocs.c

@@ -34,6 +34,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "windowstr.h"
 #include "dixfontstr.h"

Xext/saver.c

@@ -38,6 +38,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "dix/colormap_priv.h"
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 #include "os/screensaver.h"
 
 #include "misc.h"
@@ -64,6 +65,10 @@ in this Software without prior written authorization from the X Consortium.
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
+// temporary workaround for win32/mingw32 name clash
+// see: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355
+// #undef CreateWindow
+
 static int ScreenSaverEventBase = 0;
 
 static Bool ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force);

Xext/security.c

@@ -37,6 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #include "include/extinit_priv.h"
 #include "os/audit.h"
 #include "os/auth.h"
+#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "inputstr.h"

Xext/sync.c

@@ -61,6 +61,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/syncproto.h>
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "os.h"

composite/compinit.c

@@ -46,6 +46,7 @@
 #endif
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "compint.h"
 #include "compositeext.h"

dix/devices.c

@@ -61,6 +61,7 @@ SOFTWARE.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "dix/ptrveloc_priv.h"
+#include "os/osdep.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"

dix/gc.c

@@ -54,6 +54,7 @@ SOFTWARE.
 #include <X11/Xproto.h>
 
 #include "dix/gc_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "resource.h"

fb/fbscreen.c

@@ -24,6 +24,8 @@
 #include <dix-config.h>
 #endif
 
+#include "os/osdep.h"
+
 #include "fb.h"
 
 Bool

include/misc.h

@@ -390,8 +390,6 @@ extern _X_EXPORT void SwapShorts(short *list, unsigned long count);
 
 extern _X_EXPORT void MakePredeclaredAtoms(void);
 
-extern _X_EXPORT int Ones(unsigned long /*mask */ );
-
 typedef struct _xPoint *DDXPointPtr;
 typedef struct pixman_box16 *BoxPtr;
 typedef struct _xEvent *xEventPtr;

os/osdep.h

@@ -215,4 +215,6 @@ extern Bool CoreDump;
 extern Bool NoListenAll;
 extern Bool AllowByteSwappedClients;
 
+int Ones(unsigned long mask);
+
 #endif                          /* _OSDEP_H_ */

render/mipict.c

@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

render/picture.c

@@ -27,6 +27,7 @@
 #endif
 
 #include "dix/colormap_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "scrnintstr.h"

render/render.c

@@ -35,6 +35,7 @@
 
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "os.h"

xkb/xkb.c

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