Nothing in dmx uses these names any more, and it builds cleanly without trying to undef them.
Signed-off-by: Jamey Sharp <ja...@minilop.net> --- hw/dmx/glxProxy/glxcmds.c | 5 ----- hw/dmx/glxProxy/glxscreens.c | 5 ----- hw/dmx/glxProxy/glxsingle.c | 5 ----- hw/dmx/glxProxy/glxvendor.c | 5 ----- 4 files changed, 0 insertions(+), 20 deletions(-) diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index de248ed..74ee750 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -38,11 +38,6 @@ #include "dmxfont.h" #include "dmxsync.h" -#undef Xmalloc -#undef Xcalloc -#undef Xrealloc -#undef Xfree - #include "glxserver.h" #include <GL/glxtokens.h> #include "g_disptab.h" diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c index dbd4a92..daf6dfa 100644 --- a/hw/dmx/glxProxy/glxscreens.c +++ b/hw/dmx/glxProxy/glxscreens.c @@ -35,11 +35,6 @@ #include "dmx.h" #include "dmxlog.h" -#undef Xmalloc -#undef Xcalloc -#undef Xrealloc -#undef Xfree - #include "glxserver.h" #include <windowstr.h> diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index a41257e..3e12780 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -39,11 +39,6 @@ #include "dmxfont.h" #include "dmxcb.h" -#undef Xmalloc -#undef Xcalloc -#undef Xrealloc -#undef Xfree - #include "glxserver.h" #include "glxext.h" #include "g_disptab.h" diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c index cf864c2..0fb6b53 100644 --- a/hw/dmx/glxProxy/glxvendor.c +++ b/hw/dmx/glxProxy/glxvendor.c @@ -38,11 +38,6 @@ #include "dmxpixmap.h" #include "dmxfont.h" -#undef Xmalloc -#undef Xcalloc -#undef Xrealloc -#undef Xfree - #include "glxserver.h" #include "glxext.h" #include "g_disptab.h" -- 1.7.0 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
