dix: unexport Ones()

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>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1695>
(cherry picked from commit 1642adec3b)

Xext/panoramiXprocs.c

@@ -32,6 +32,9 @@ Equipment Corporation.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "os/osdep.h"
+
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"

Xext/saver.c

@@ -32,6 +32,10 @@ in this Software without prior written authorization from the X Consortium.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/saverproto.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -41,7 +45,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/saverproto.h>
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
@@ -61,6 +64,10 @@ in this Software without prior written authorization from the X Consortium.
 
 #include "extinit.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

@@ -32,6 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/securproto.h>
 #include <X11/Xfuncproto.h>
 
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "inputstr.h"
 #include "windowstr.h"

Xext/shm.c

@@ -43,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xproto.h>
 
 #include "os/busfault.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "os.h"

Xext/sync.c

@@ -58,6 +58,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>
+#include <X11/extensions/syncproto.h>
+
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "os.h"
 #include "extnsionst.h"
@@ -65,7 +69,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "pixmapstr.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/syncproto.h>
 #include "syncsrv.h"
 #include "syncsdk.h"
 #include "protocol-versions.h"

composite/compinit.c

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

dix/devices.c

@@ -48,11 +48,19 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <math.h>
+#include <pixman.h>
 #include <X11/X.h>
-#include "misc.h"
-#include "resource.h"
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2.h>
+#include <X11/extensions/XIproto.h>
+
+#include "os/osdep.h"
+
+#include "misc.h"
+#include "resource.h"
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -71,11 +79,6 @@ SOFTWARE.
 #include "eventstr.h"
 #include "dixgrabs.h"
 
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2.h>
-#include <X11/extensions/XIproto.h>
-#include <math.h>
-#include <pixman.h>
 #include "exglobals.h"
 #include "exevents.h"
 #include "xiquerydevice.h"      /* for SizeDeviceClasses */

dix/gc.c

@@ -51,6 +51,9 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "resource.h"
 #include "gcstruct.h"

fb/fbscreen.c

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

hw/xfree86/common/xf86Config.c

@@ -50,6 +50,8 @@
 #include <sys/types.h>
 #include <grp.h>
 
+#include "os/osdep.h"
+
 #include "xf86.h"
 #include "xf86Modes.h"
 #include "xf86Parser.h"

include/misc.h

@@ -394,8 +394,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

@@ -246,4 +246,6 @@ void ForceClockId(clockid_t forced_clockid);
 Bool WaitForSomething(Bool clients_are_ready);
 void CloseDownConnection(ClientPtr client);
 
+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

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

render/render.c

@@ -28,6 +28,12 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/render.h>
+#include <X11/extensions/renderproto.h>
+#include <X11/Xfuncproto.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -39,11 +45,8 @@
 #include "extnsionst.h"
 #include "extinit.h"
 #include "servermd.h"
-#include <X11/extensions/render.h>
-#include <X11/extensions/renderproto.h>
 #include "picturestr.h"
 #include "glyphstr.h"
-#include <X11/Xfuncproto.h>
 #include "cursorstr.h"
 #include "xace.h"
 #include "protocol-versions.h"

xkb/xkb.c

@@ -31,6 +31,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XKMformat.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>