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 | |
| 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')
| -rw-r--r-- | xorg-server/include/dixfont.h | 13 | ||||
| -rw-r--r-- | xorg-server/include/globals.h | 3 | ||||
| -rw-r--r-- | xorg-server/include/misc.h | 10 | ||||
| -rw-r--r-- | xorg-server/include/os.h | 13 |
4 files changed, 29 insertions, 10 deletions
diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h index 9333041fb..3d09eb5ae 100644 --- a/xorg-server/include/dixfont.h +++ b/xorg-server/include/dixfont.h @@ -117,12 +117,13 @@ extern _X_EXPORT void FreeFonts(void); extern _X_EXPORT FontPtr find_old_font(XID /*id */ ); -extern _X_EXPORT void GetGlyphs(FontPtr /*font */ , - unsigned long /*count */ , - unsigned char * /*chars */ , - FontEncoding /*fontEncoding */ , - unsigned long * /*glyphcount */ , - CharInfoPtr * /*glyphs */ ); +#define GetGlyphs dixGetGlyphs +extern _X_EXPORT void dixGetGlyphs(FontPtr /*font */ , + unsigned long /*count */ , + unsigned char * /*chars */ , + FontEncoding /*fontEncoding */ , + unsigned long * /*glyphcount */ , + CharInfoPtr * /*glyphs */ ); extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont */ , CharInfoPtr * /*charinfo */ , diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h index 8076955a9..6d3f3d708 100644 --- a/xorg-server/include/globals.h +++ b/xorg-server/include/globals.h @@ -2,6 +2,8 @@ #ifndef _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_ +#include <signal.h> + #include "window.h" /* for WindowPtr */ /* Global X server variables that are visible to mi, dix, os, and ddx */ @@ -23,6 +25,7 @@ extern _X_EXPORT int GrabInProgress; extern _X_EXPORT Bool noTestExtensions; extern _X_EXPORT char *SeatId; extern _X_EXPORT char *ConnectionInfo; +extern _X_EXPORT sig_atomic_t inSignalContext; #ifdef DPMSExtension extern _X_EXPORT CARD32 DPMSStandbyTime; diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index fea74b86c..aa62f6a3a 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -229,6 +229,8 @@ pad_to_int32(const int bytes) } extern char **xstrtokenize(const char *str, const char *separators); +extern void FormatUInt64(uint64_t num, char *string); +extern void FormatUInt64Hex(uint64_t num, char *string); /** * Compare the two version numbers comprising of major.minor. @@ -369,10 +371,10 @@ extern _X_EXPORT unsigned long serverGeneration; /* Don't use this directly, use BUG_WARN or BUG_WARN_MSG instead */ #define __BUG_WARN_MSG(cond, with_msg, ...) \ do { if (cond) { \ - ErrorF("BUG: triggered 'if (" #cond ")'\n"); \ - ErrorF("BUG: %s:%d in %s()\n", \ - __FILE__, __LINE__, __func__); \ - if (with_msg) ErrorF(__VA_ARGS__); \ + ErrorFSigSafe("BUG: triggered 'if (" #cond ")'\n"); \ + ErrorFSigSafe("BUG: %s:%u in %s()\n", \ + __FILE__, __LINE__, __func__); \ + if (with_msg) ErrorFSigSafe(__VA_ARGS__); \ xorg_backtrace(); \ } } while(0) 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 |