summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-04 14:54:29 +0000
committerDana Jansens <danakj@orodu.net>2003-09-04 14:54:29 +0000
commit32b381fbcae3f6978978627468328514dddcf45b (patch)
tree982b7acbe98fb762d2e8c5376556cc0d3017891d
parent4cbfe3eac0570679ae3a8e5c4df20e06d5418573 (diff)
fix RECT_CONTAINS, name clash
-rw-r--r--openbox/geom.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/openbox/geom.h b/openbox/geom.h
index e20c660a..e410ecda 100644
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -33,9 +33,9 @@ typedef struct _Rect {
(r1).width == (r2).width && \
(r1).height == (r2).height)
-#define RECT_CONTAINS(r, x, y) \
- ((x) >= (r).x && (x) < (r).x + (r).width && \
- (y) >= (r).y && (y) < (r).y + (r).height)
+#define RECT_CONTAINS(r, px, py) \
+ ((px) >= (r).x && (px) < (r).x + (r).width && \
+ (py) >= (r).y && (py) < (r).y + (r).height)
#define RECT_CONTAINS_RECT(r, o) \
((o).x >= (r).x && (o).x + (o).width <= (r).x + (r).width && \
(o).y >= (r).y && (o).y + (o).height <= (r).y + (r).height)