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>
This commit is contained in:
parent
76d31d6bfc
commit
27233c3fa1
|
|
@ -50,6 +50,7 @@
|
||||||
#include "xf86platformBus_priv.h"
|
#include "xf86platformBus_priv.h"
|
||||||
#include "xf86Config.h"
|
#include "xf86Config.h"
|
||||||
#include "xf86Crtc.h"
|
#include "xf86Crtc.h"
|
||||||
|
#include "xf86OSpriv.h"
|
||||||
|
|
||||||
#include "randrstr.h"
|
#include "randrstr.h"
|
||||||
int platformSlotClaimed;
|
int platformSlotClaimed;
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
#include "xf86Bus.h"
|
#include "xf86Bus.h"
|
||||||
|
|
||||||
#include "hotplug.h"
|
#include "hotplug.h"
|
||||||
|
#include "xf86OSpriv.h"
|
||||||
#include "systemd-logind.h"
|
#include "systemd-logind.h"
|
||||||
|
|
||||||
static Bool
|
static Bool
|
||||||
|
|
|
||||||
|
|
@ -38,4 +38,13 @@ typedef struct {
|
||||||
|
|
||||||
void xf86OSInitVidMem(VidMemInfoPtr);
|
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 */
|
#endif /* _XF86OSPRIV_H */
|
||||||
|
|
|
||||||
|
|
@ -188,15 +188,6 @@ extern _X_EXPORT void xf86InitVidMem(void);
|
||||||
|
|
||||||
#endif /* XF86_OS_PRIVS */
|
#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
|
_XFUNCPROTOEND
|
||||||
#endif /* NO_OSLIB_PROTOTYPES */
|
#endif /* NO_OSLIB_PROTOTYPES */
|
||||||
#endif /* _XF86_OSPROC_H */
|
#endif /* _XF86_OSPROC_H */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue