summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moreau <oreaus@gmail.com>2011-02-22 07:16:15 -0700
committerScott Moreau <oreaus@gmail.com>2011-02-22 07:16:15 -0700
commit65bba4e4615de54f79f3b127c915cf8f06b6bba5 (patch)
tree32e49c4589ab058014ce2b2b71397c57aed9998b
parent6f00f4acd43879bf776c9c7e713dfd83feedff9f (diff)
downloadtile-65bba4e4615de54f79f3b127c915cf8f06b6bba5.tar.gz
tile-65bba4e4615de54f79f3b127c915cf8f06b6bba5.tar.bz2
Avoid using reserved definition.
-rw-r--r--src/tile.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tile.cpp b/src/tile.cpp
index 4e1cd68..0dfd806 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -532,13 +532,13 @@ TileWindow::constrainMinMax (int width,
max_width = hints->max_width;
max_height = hints->max_height;
}
-#define CLAMP(v, min, max) ((v) <= (min) ? (min) : (v) >= (max) ? (max) : (v))
+#define CLAMPW(v, min, max) ((v) <= (min) ? (min) : (v) >= (max) ? (max) : (v))
/* clamp width and height to min and max values */
- width = CLAMP (width, min_width, max_width);
- height = CLAMP (height, min_height, max_height);
+ width = CLAMPW (width, min_width, max_width);
+ height = CLAMPW (height, min_height, max_height);
-#undef CLAMP
+#undef CLAMPW
newWidth = width;
newHeight = height;