diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
| commit | 2ddb14008968ea365e3d395487cad2bfe154da9d (patch) | |
| tree | f9d970e9dd6ee1ec835fedcadc15a8705a50e6d5 /xorg-server/hw/dmx/glxProxy/glxsingle.c | |
| parent | b7a6351e37e788bb25415dc79aaf2718b48d6939 (diff) | |
| parent | 3815190d52f8ae453c2458335394eb5b18ab9bf5 (diff) | |
| download | vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.gz vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.bz2 vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/glxProxy/glxsingle.c')
| -rw-r--r-- | xorg-server/hw/dmx/glxProxy/glxsingle.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c index 056c74066..7856f5884 100644 --- a/xorg-server/hw/dmx/glxProxy/glxsingle.c +++ b/xorg-server/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"
|