summaryrefslogtreecommitdiff
path: root/glx/glxserver.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-09-21 14:34:27 -0700
committerKeith Packard <keithp@keithp.com>2011-09-21 14:34:27 -0700
commit7fb4bef0394a5d09680985d34bce8252b61493cb (patch)
tree9377b410bd93e67d78970c69b7c79cc8c318fa23 /glx/glxserver.h
parent98f4940093dc90c3366d3e4d3ddceacbaee299dc (diff)
parentc90903b4f7a826ae6826a8dd0a901c8362500e46 (diff)
Merge remote-tracking branch 'mattst88/for-keith'
Diffstat (limited to 'glx/glxserver.h')
-rw-r--r--glx/glxserver.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 891315b74..6bcf7d3a7 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -46,12 +46,6 @@
#include <resource.h>
#include <scrnintstr.h>
-/*
-** The X header misc.h defines these math functions.
-*/
-#undef abs
-#undef fabs
-
#define GL_GLEXT_PROTOTYPES /* we want prototypes */
#include <GL/gl.h>
#include <GL/glxproto.h>