diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/os/log.c | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/os/log.c')
| -rw-r--r-- | xorg-server/os/log.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c index ef34b1afe..75b3375c0 100644 --- a/xorg-server/os/log.c +++ b/xorg-server/os/log.c @@ -104,6 +104,10 @@ OR PERFORMANCE OF THIS SOFTWARE. #define S_ISREG(m) (((m)&_S_IFMT) == _S_IFREG) #endif +#ifdef XF86BIGFONT +#define _XF86BIGFONT_SERVER_ +#include <X11/extensions/xf86bigfont.h> +#endif #ifdef DDXOSVERRORF void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL; @@ -255,7 +259,7 @@ LogSetParameter(LogParameter param, int value) /* This function does the actual log message writes. */ -_X_EXPORT void +void LogVWrite(int verb, const char *f, va_list args) { static char tmpBuffer[1024]; @@ -304,7 +308,7 @@ LogVWrite(int verb, const char *f, va_list args) } } -_X_EXPORT void +void LogWrite(int verb, const char *f, ...) { va_list args; @@ -314,7 +318,7 @@ LogWrite(int verb, const char *f, ...) va_end(args); } -_X_EXPORT void +void LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) { const char *s = X_UNKNOWN_STRING; @@ -369,7 +373,7 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) } /* Log message with verbosity level specified. */ -_X_EXPORT void +void LogMessageVerb(MessageType type, int verb, const char *format, ...) { va_list ap; @@ -380,7 +384,7 @@ LogMessageVerb(MessageType type, int verb, const char *format, ...) } /* Log a message with the standard verbosity level of 1. */ -_X_EXPORT void +void LogMessage(MessageType type, const char *format, ...) { va_list ap; @@ -397,6 +401,9 @@ void AbortServer(void) __attribute__((noreturn)); void AbortServer(void) { +#ifdef XF86BIGFONT + XF86BigfontCleanup(); +#endif CloseWellKnownConnections(); OsCleanup(TRUE); CloseDownDevices(); @@ -416,7 +423,7 @@ static int nrepeat = 0; static int oldlen = -1; static OsTimerPtr auditTimer = NULL; -void +void FreeAuditTimer(void) { if (auditTimer != NULL) { @@ -506,7 +513,7 @@ VAuditF(const char *f, va_list args) free(prefix); } -_X_EXPORT void +void FatalError(const char *f, ...) { va_list args; @@ -531,7 +538,7 @@ FatalError(const char *f, ...) /*NOTREACHED*/ } -_X_EXPORT void +void VErrorF(const char *f, va_list args) { #ifdef DDXOSVERRORF @@ -544,7 +551,7 @@ VErrorF(const char *f, va_list args) #endif } -_X_EXPORT void +void ErrorF(const char * f, ...) { va_list args; @@ -556,7 +563,7 @@ ErrorF(const char * f, ...) /* A perror() workalike. */ -_X_EXPORT void +void Error(char *str) { char *err = NULL; |