From: Dana Jansens Date: Sun, 6 Apr 2003 06:16:34 +0000 (+0000) Subject: add ()'s to the macros for more safety X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=b31eb83f04f68225c5357960d9e04f76c7561c83;p=chaz%2Fopenbox add ()'s to the macros for more safety --- diff --git a/openbox/geom.h b/openbox/geom.h index 221d362e..a4c1752a 100644 --- a/openbox/geom.h +++ b/openbox/geom.h @@ -6,14 +6,14 @@ typedef struct Point { int y; } Point; -#define POINT_SET(pt, nx, ny) pt.x = (nx), pt.y = (ny) +#define POINT_SET(pt, nx, ny) (pt).x = (nx), (pt).y = (ny) typedef struct Size { int width; int height; } Size; -#define SIZE_SET(sz, w, h) sz.width = (w), sz.height = (h) +#define SIZE_SET(sz, w, h) (sz).width = (w), (sz).height = (h) typedef struct Rect { int x; @@ -23,17 +23,19 @@ typedef struct Rect { } Rect; #define RECT_SET_POINT(r, nx, ny) \ - r.x = (ny), r.y = (ny) + (r).x = (ny), (r).y = (ny) #define RECT_SET_SIZE(r, w, h) \ - r.width = (w), r.height = (h) + (r).width = (w), (r).height = (h) #define RECT_SET(r, nx, ny, w, h) \ - r.x = (nx), r.y = (ny), r.width = (w), r.height = (h) + (r).x = (nx), (r).y = (ny), (r).width = (w), (r).height = (h) -#define RECT_EQUAL(r1, r2) (r1.x == r2.x && r1.y == r2.y && \ - r1.width == r2.width && r1.height == r2.height) +#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) + (x >= (r).x && x < (r).x + (r).width && \ + y >= (r).y && y < (r).y + (r).height) typedef struct Strut { int left; @@ -43,10 +45,12 @@ typedef struct Strut { } Strut; #define STRUT_SET(s, l, t, r, b) \ - s.left = (l), s.top = (t), s.right = (r), s.bottom = (b) + (s).left = (l), (s).top = (t), (s).right = (r), (s).bottom = (b) #define STRUT_ADD(s1, s2) \ - s1.left = MAX(s1.left, s2.left), s1.right = MAX(s1.right, s2.right), \ - s1.top = MAX(s1.top, s2.top), s1.bottom = MAX(s1.bottom, s2.bottom) + (s1).left = MAX((s1).left, (s2).left), \ + (s1).right = MAX((s1).right, (s2).right), \ + (s1).top = MAX((s1).top, (s2).top), \ + (s1).bottom = MAX((s1).bottom, (s2).bottom) #endif