fix RECT_CONTAINS, name clash
Dana Jansens danakj@orodu.net
1 files changed,
3 insertions(+),
3 deletions(-)
jump to
M
openbox/geom.h
→
openbox/geom.h
@@ -33,9 +33,9 @@ #define RECT_EQUAL(r1, r2) ((r1).x == (r2).x && (r1).y == (r2).y && \
(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)