diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-15 11:16:33 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-15 11:16:33 +0000 |
| commit | 23486f48a5034b3a25be6ced6cdba9a86131e1f0 (patch) | |
| tree | 3b07f204def7bd2f0c7139f4d04e2d65301a949b /Gui | |
| parent | 4ee359e3664ed23d50a59db84d8d180debe94bef (diff) | |
| download | mpv-23486f48a5034b3a25be6ced6cdba9a86131e1f0.tar.bz2 mpv-23486f48a5034b3a25be6ced6cdba9a86131e1f0.tar.xz | |
bunkus: Encapsulated arguments to #define in ( ... ) so that the #defines can be safely used like functions: mydef(flag ? val1 : val2)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8958 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/wm/ws.h | 2 | ||||
| -rw-r--r-- | Gui/wm/wsxdnd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h index bd0b6c802d..f14b01483a 100644 --- a/Gui/wm/ws.h +++ b/Gui/wm/ws.h @@ -254,7 +254,7 @@ extern int wsGetOutMask( void ); extern void wsScreenSaverOn( Display *mDisplay ); extern void wsScreenSaverOff( Display * mDisplay ); -#define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( X > tX )&&( Y > tY )&&( X < bX )&&( Y < bY ) ) +#define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( (X) > (tX) )&&( (Y) > (tY) )&&( (X) < (bX) )&&( (Y) < (bY) ) ) #endif diff --git a/Gui/wm/wsxdnd.h b/Gui/wm/wsxdnd.h index 8d88aeacdc..19eaffd541 100644 --- a/Gui/wm/wsxdnd.h +++ b/Gui/wm/wsxdnd.h @@ -17,7 +17,7 @@ void wsXDNDClearAwareness(wsTWindow* window); #define XDND_ENTER_THREE_TYPES_SET(e,b) (e)->xclient.data.l[1] = ((e)->xclient.data.l[1] & ~0x1UL) | (((b) == 0) ? 0 : 0x1UL) #define XDND_ENTER_VERSION(e) ((e)->xclient.data.l[1] >> 24) #define XDND_ENTER_VERSION_SET(e,v) (e)->xclient.data.l[1] = ((e)->xclient.data.l[1] & ~(0xFF << 24)) | ((v) << 24) -#define XDND_ENTER_TYPE(e,i) ((e)->xclient.data.l[2 + i]) /* i => (0, 1, 2) */ +#define XDND_ENTER_TYPE(e,i) ((e)->xclient.data.l[2 + (i)]) /* i => (0, 1, 2) */ /* XdndPosition */ #define XDND_POSITION_SOURCE_WIN(e) ((e)->xclient.data.l[0]) |