summaryrefslogtreecommitdiff
path: root/miext/rootless/rootlessCommon.h
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-06-03 13:37:32 -0400
committerAdam Jackson <ajax@redhat.com>2009-06-03 13:45:42 -0400
commite1e8c7ddd7fdbfd674361364295fb1cbd5f28b45 (patch)
tree52945278e94746acfb4c01fd5f81b0af19aaa5ea /miext/rootless/rootlessCommon.h
parent7f027d9dc0146e229802aeac342ea2dbab63264a (diff)
s/MIN/min/, s/MAX/max/ (#2968)
Diffstat (limited to 'miext/rootless/rootlessCommon.h')
-rw-r--r--miext/rootless/rootlessCommon.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index a92f1f1e4..ba121c0f4 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -36,6 +36,7 @@
#ifndef _ROOTLESSCOMMON_H
#define _ROOTLESSCOMMON_H
+#include "misc.h"
#include "rootless.h"
#include "fb.h"
@@ -120,12 +121,6 @@ typedef struct _RootlessScreenRec {
unsigned int colormap_changed :1;
} RootlessScreenRec, *RootlessScreenPtr;
-
-#undef MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-#undef MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-
// "Definition of the Porting Layer for the X11 Sample Server" says
// unwrap and rewrap of screen functions is unnecessary, but
// screen->CreateGC changes after a call to cfbCreateGC.