summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-07-01 15:00:25 +1000
committerAaron Plattner <aplattner@nvidia.com>2011-04-12 15:48:30 -0700
commit18d1a205eae74ab792848107736a67e14cbdc6c2 (patch)
tree8631694ff54b6b6248d28d64246c35eba69b7072
parentf085734166a8d6b7df5ef2854fb2183b69b22e33 (diff)
My NULL is bigger than yours, don't you dare redefine it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-rw-r--r--xts5/src/libproto/XlibXtst.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/xts5/src/libproto/XlibXtst.c b/xts5/src/libproto/XlibXtst.c
index cc07984c..970c0ab4 100644
--- a/xts5/src/libproto/XlibXtst.c
+++ b/xts5/src/libproto/XlibXtst.c
@@ -274,9 +274,6 @@ int XstDisconnectDisplay (server)
return close(server);
}
-#undef NULL
-#define NULL ((char *) 0)
-
_XstWaitForReadable(dpy)
XstDisplay *dpy;
{