diff options
Diffstat (limited to 'hw')
-rw-r--r-- | hw/dmx/dmxcb.c | 6 | ||||
-rw-r--r-- | hw/dmx/dmxextension.c | 6 | ||||
-rw-r--r-- | hw/dmx/dmxfont.c | 6 | ||||
-rw-r--r-- | hw/dmx/dmxpict.c | 6 | ||||
-rw-r--r-- | hw/dmx/dmxscrinit.c | 6 | ||||
-rw-r--r-- | hw/dmx/glxProxy/glxutil.c | 6 | ||||
-rw-r--r-- | hw/dmx/glxProxy/glxvisuals.c | 6 |
7 files changed, 42 insertions, 0 deletions
diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c index 4e7279a51..ae6eb6fb2 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 d20c844aa..91479e7a5 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 b70f7d2df..c739159a8 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 37dfa10ac..8bce6892e 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 736075094..28c8b0185 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 080992ea9..e3056bbd4 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 b961dfaef..c8b1eea31 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; |