From: Dana Jansens <danakj@orodu.net>
Date: Thu, 4 Sep 2003 14:54:29 +0000 (+0000)
Subject: fix RECT_CONTAINS, name clash
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=32b381fbcae3f6978978627468328514dddcf45b;p=chaz%2Fopenbox

fix RECT_CONTAINS, name clash
---

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)