diff options
author | marha <marha@users.sourceforge.net> | 2012-07-04 10:36:18 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-04 10:36:18 +0200 |
commit | fc8f37239f3af088819c18f5632b2608954af73a (patch) | |
tree | 012ded3d00546b7f2fa807f466643eadf6f815ba /xorg-server/include/os.h | |
parent | fdef5bff99e6079f64bc6b91c91b42195c85adeb (diff) | |
download | vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.tar.gz vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.tar.bz2 vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.zip |
mesa xserver git update 4 Jul 2012
Diffstat (limited to 'xorg-server/include/os.h')
-rw-r--r-- | xorg-server/include/os.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 276eb5213..e93c48ae6 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -49,6 +49,7 @@ SOFTWARE. #include "misc.h" #include <stdarg.h> +#include <stdint.h> #include <string.h> #define SCREEN_SAVER_ON 0 @@ -604,6 +605,12 @@ _X_ATTRIBUTE_PRINTF(3, 4); extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...) _X_ATTRIBUTE_PRINTF(2, 3); +extern _X_EXPORT void +LogMessageVerbSigSafe(MessageType type, int verb, const char *format, ...) +_X_ATTRIBUTE_PRINTF(3, 4); +extern _X_EXPORT void +LogVMessageVerbSigSafe(MessageType type, int verb, const char *format, va_list args) +_X_ATTRIBUTE_PRINTF(3, 0); extern _X_EXPORT void LogVHdrMessageVerb(MessageType type, int verb, @@ -649,6 +656,12 @@ extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2); extern _X_EXPORT void +VErrorFSigSafe(const char *f, va_list args) +_X_ATTRIBUTE_PRINTF(1, 0); +extern _X_EXPORT void +ErrorFSigSafe(const char *f, ...) +_X_ATTRIBUTE_PRINTF(1, 2); +extern _X_EXPORT void LogPrintMarkers(void); extern _X_EXPORT void |