Skip to content

Commit b512686

Browse files
committed
[PR #1367] os: move OsVendorFatalError() and OsVendorInit() to ddx_priv.h
PR: #1367
1 parent 3e2e3a3 commit b512686

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

os/ddx_priv.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@ void ddxGiveUp(enum ExitCode error);
2525

2626
void ddxInputThreadInit(void);
2727

28+
void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
29+
void OsVendorInit(void);
30+
2831
#endif /* _XSERVER_OS_DDX_PRIV_H */

os/osdep.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler);
151151

152152
void OsInit(void);
153153
void OsCleanup(Bool);
154-
void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
155-
void OsVendorInit(void);
156154

157155
_X_EXPORT /* needed by the int10 module, but should not be used by OOT drivers */
158156
void OsBlockSignals(void);

os/osinit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ SOFTWARE.
6060

6161
#include "dix/dix_priv.h"
6262
#include "os/busfault.h"
63+
#include "os/ddx_priv.h"
6364
#include "os/log_priv.h"
6465
#include "os/osdep.h"
6566
#include "os/serverlock.h"

0 commit comments

Comments
 (0)