xfree86: common: move private defs from xf86_OSproc.h to xf86OSpriv.h

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

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

hw/xfree86/common/xf86platformBus.c

@@ -50,6 +50,7 @@
 #include "xf86platformBus_priv.h"
 #include "xf86Config.h"
 #include "xf86Crtc.h"
+#include "xf86OSpriv.h"
 
 #include "randrstr.h"
 int platformSlotClaimed;

hw/xfree86/os-support/shared/drm_platform.c

@@ -18,6 +18,7 @@
 #include "xf86Bus.h"
 
 #include "hotplug.h"
+#include "xf86OSpriv.h"
 #include "systemd-logind.h"
 
 static Bool

hw/xfree86/os-support/xf86OSpriv.h

@@ -38,4 +38,13 @@ typedef struct {
 
 void xf86OSInitVidMem(VidMemInfoPtr);
 
+#ifdef XSERVER_PLATFORM_BUS
+#include "hotplug.h"
+void
+xf86PlatformDeviceProbe(struct OdevAttributes *attribs);
+
+void
+xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs);
+#endif
+
 #endif                          /* _XF86OSPRIV_H */

hw/xfree86/os-support/xf86_OSproc.h

@@ -188,15 +188,6 @@ extern _X_EXPORT void xf86InitVidMem(void);
 
 #endif                          /* XF86_OS_PRIVS */
 
-#ifdef XSERVER_PLATFORM_BUS
-#include "hotplug.h"
-void
-xf86PlatformDeviceProbe(struct OdevAttributes *attribs);
-
-void
-xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs);
-#endif
-
 _XFUNCPROTOEND
 #endif                          /* NO_OSLIB_PROTOTYPES */
 #endif                          /* _XF86_OSPROC_H */