xserver: Branch 'server-1.6-branch'

[Keith Packard]

 hw/dmx/dmxcb.c               |    6 ++++++
 hw/dmx/dmxextension.c        |    6 ++++++
 hw/dmx/dmxfont.c             |    6 ++++++
 hw/dmx/dmxpict.c             |    6 ++++++
 hw/dmx/dmxscrinit.c          |    6 ++++++
 hw/dmx/glxProxy/glxutil.c    |    6 ++++++
 hw/dmx/glxProxy/glxvisuals.c |    6 ++++++
 7 files changed, 42 insertions(+)

New commits:
commit cbd977cc15cf22a3e42b10942d5657cb8b9ac335
Author: Alban Browaeys <prahal at yahoo.com>
Date:   Mon Jan 12 10:57:11 2009 -0800

    Fix dmx compile on 1.6 branch.
    
    http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg166742.html
    contains a patch from "arekm" which I build upon to make up this one.
    
    Mostly fixes for Xcalloc which I previously tried to fix the same way but
    without finding the right spot.
    
    I cannot tell if dmx works though. Only that it at least compile.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
index 4e7279a..ae6eb6f 100644
--- a/hw/dmx/dmxcb.c
+++ b/hw/dmx/dmxcb.c
@@ -43,6 +43,12 @@
 #include "dmxinput.h"
 #include "dmxlog.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 extern int     connBlockScreenStart;
 
 #ifdef PANORAMIX
diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index d20c844..91479e7 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -64,6 +64,12 @@
 #include <X11/extensions/dmxproto.h>  /* For DMX_BAD_* */
 #include "cursorstr.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 /* The default font is declared in dix/globals.c, but is not included in
  * _any_ header files. */
 extern FontPtr  defaultFont;
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index b70f7d2..c739159 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -49,6 +49,12 @@
 #include "dixfont.h"
 #include "dixstruct.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 static int (*dmxSaveProcVector[256])(ClientPtr);
 static int   dmxFontLastError;
 
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 37dfa10..8bce689 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -56,6 +56,12 @@
 #include "mipict.h"
 #include "fbpict.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 
 extern int RenderErrBase;
 extern int (*ProcRenderVector[RenderNumberRequests])(ClientPtr);
diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 7360750..28c8b01 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -61,6 +61,12 @@
 #include "mipointer.h"
 #include "micmap.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);
 static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
 
diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
index 080992e..e3056bb 100644
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@@ -36,6 +36,12 @@
 #include <windowstr.h>
 #include "glxutil.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 /************************************************************************/
 
 void __glXNop(void) {}
diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c
index b961dfa..c8b1eea 100644
--- a/hw/dmx/glxProxy/glxvisuals.c
+++ b/hw/dmx/glxProxy/glxvisuals.c
@@ -38,6 +38,12 @@
 #include "glxutil.h"
 #include "dmx_glxvisuals.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 static int                 numConfigs     = 0;
 static __GLXvisualConfig  *visualConfigs  = NULL;
 static void              **visualPrivates = NULL;