svn merge ^/branches/released .

3 files changed, 12 insertions, 10 deletions

diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 81dc01d41..56f45726f 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -30,9 +30,6 @@
 /* Support Damage extension */

 #undef DAMAGE

 

-/* Build for darwin with Quartz support */

-#undef DARWIN_WITH_QUARTZ

-

 /* Use OsVendorVErrorF */

 #undef DDXOSVERRORF

 

@@ -127,8 +124,8 @@
 /* Support application updating through sparkle. */

 #undef XQUARTZ_SPARKLE

 

-/* Prefix to use for launchd identifiers */

-#undef LAUNCHD_ID_PREFIX

+/* Prefix to use for bundle identifiers */

+#undef BUNDLE_ID_PREFIX

 

 /* Build a standalone xpbproxy */

 #undef STANDALONE_XPBPROXY

@@ -447,7 +444,7 @@
 /* Define to 1 if you have the `ffs' function. */

 #undef HAVE_FFS

 

-/* If the compiler supports a TLS storage class define it to that here */

+/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */

 #undef TLS

 

 /* Correctly set _XSERVER64 for OSX fat binaries */

diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index a11cacc44..b7cf76db5 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -512,17 +512,17 @@ typedef enum {
 extern _X_EXPORT const char *LogInit(const char *fname, const char *backup);

 extern _X_EXPORT void LogClose(void);

 extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value);

-extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args);

+extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args) _X_ATTRIBUTE_PRINTF(2,0);

 extern _X_EXPORT void LogWrite(int verb, const char *f, ...) _X_ATTRIBUTE_PRINTF(2,3);

 extern _X_EXPORT void LogVMessageVerb(MessageType type, int verb, const char *format,

-			    va_list args);

+			    va_list args) _X_ATTRIBUTE_PRINTF(3,0);

 extern _X_EXPORT void LogMessageVerb(MessageType type, int verb, const char *format,

 			   ...) _X_ATTRIBUTE_PRINTF(3,4);

 extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)

 			_X_ATTRIBUTE_PRINTF(2,3);

 extern _X_EXPORT void FreeAuditTimer(void);

 extern _X_EXPORT void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

-extern _X_EXPORT void VAuditF(const char *f, va_list args);

+extern _X_EXPORT void VAuditF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);

 extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;

 

 #ifdef DEBUG

@@ -531,7 +531,7 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X
 #define DebugF(...) /* */

 #endif

 

-extern _X_EXPORT void VErrorF(const char *f, va_list args);

+extern _X_EXPORT void VErrorF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);

 extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

 extern _X_EXPORT void Error(const char *str);

 extern _X_EXPORT void LogPrintMarkers(void);

diff --git a/xorg-server/include/regionstr.h b/xorg-server/include/regionstr.h
index f34ecf319..75db30a3f 100644
--- a/xorg-server/include/regionstr.h
+++ b/xorg-server/include/regionstr.h
@@ -132,6 +132,11 @@ static inline void RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
     }

 }

 

+static inline Bool RegionInitBoxes(RegionPtr pReg, BoxPtr boxes, int nBoxes)

+{

+    return pixman_region_init_rects (pReg, boxes, nBoxes);

+}

+

 static inline void RegionUninit(RegionPtr _pReg)

 {

     if ((_pReg)->data && (_pReg)->data->size) {