xserver: Branch 'master' - 2 commits

[Matthias Hopf]

 include/os.h     |    2 +-
 render/picture.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a8a148919b84a293e3e7a49409ab833590357edb
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Oct 23 16:23:28 2007 +0200

    Superfluous ','.

diff --git a/render/picture.h b/render/picture.h
index 563a81b..e8a098c 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -115,7 +115,7 @@ typedef enum _PictFormatShort {
 /* 1bpp formats */
     PICT_a1 =		PIXMAN_a1,
 
-    PICT_g1 =		PIXMAN_g1,
+    PICT_g1 =		PIXMAN_g1
 } PictFormatShort;
 
 /*
commit 75f05086d04a90c3dcdcdd31bf79d7033708e3e0
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Oct 23 15:39:23 2007 +0200

    Get rid of unnecessary GNU extended variadic macro.

diff --git a/include/os.h b/include/os.h
index d915267..597ecd7 100644
--- a/include/os.h
+++ b/include/os.h
@@ -517,7 +517,7 @@ __attribute((noreturn))
 #ifdef DEBUG
 #define DebugF ErrorF
 #else
-#define DebugF(x, ...) /* */
+#define DebugF(...) /* */
 #endif
 
 extern void VErrorF(const char *f, va_list args);