summaryrefslogtreecommitdiff
path: root/orc/orcutils.h
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2009-03-28 18:23:13 -0700
committerDavid Schleef <ds@schleef.org>2009-03-28 18:23:13 -0700
commita60bfcb45b057437de447b19df0d8b5dc8fd2a34 (patch)
tree47a5b50d09b9e89a3196295495e6f16fbc8693a4 /orc/orcutils.h
parent24a95f2cfac8d3357f2d800e4fecf9ab5a05438b (diff)
downloadorc-a60bfcb45b057437de447b19df0d8b5dc8fd2a34.tar.gz
lots of hacking
Diffstat (limited to 'orc/orcutils.h')
-rw-r--r--orc/orcutils.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/orc/orcutils.h b/orc/orcutils.h
index 3114e4b..511773f 100644
--- a/orc/orcutils.h
+++ b/orc/orcutils.h
@@ -49,8 +49,8 @@ typedef unsigned int orc_bool;
#ifndef MAX
#define MAX(a,b) ((a)>(b) ? (a) : (b))
#endif
-#ifndef CLAMP
-#define CLAMP(x,a,b) ((x)<(a) ? (a) : ((x)>(b) ? (b) : (x)))
+#ifndef ORC_CLAMP
+#define ORC_CLAMP(x,a,b) ((x)<(a) ? (a) : ((x)>(b) ? (b) : (x)))
#endif
#define ROUND_UP_SHIFT(x,y) (((x) + (1<<(y)) - 1)>>(y))
#define ROUND_UP_POW2(x,y) (((x) + (1<<(y)) - 1)&((~0)<<(y)))