Skip to content

(master) Xi: parentheses around macro argument symbols #2924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metux wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

(master) Xi: parentheses around macro argument symbols #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Xi/extinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@ MakeDeviceTypeAtoms(void)
*
* Swap any events defined in this extension.
*/
#define DO_SWAP(func,type) func ((type *)from, (type *)to)
#define DO_SWAP(func,type) (func) ((type *)from, (type *)to)

static void _X_COLD
SEventIDispatch(xEvent *from, xEvent *to)
Expand Down
4 changes: 2 additions & 2 deletions Xi/opendev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ extern CARD8 event_base[];
*/

#define WRITE_ICI(cls) do { \
x_rpcbuf_write_CARD8(&rpcbuf, cls); \
x_rpcbuf_write_CARD8(&rpcbuf, event_base[cls]); \
x_rpcbuf_write_CARD8(&rpcbuf, (cls)); \
x_rpcbuf_write_CARD8(&rpcbuf, event_base[(cls)]); \
num_classes++; \
} while (0)

Expand Down
6 changes: 3 additions & 3 deletions Xi/xibarriers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ typedef struct _BarrierScreen {
} BarrierScreenRec, *BarrierScreenPtr;

#define GetBarrierScreen(s) ((BarrierScreenPtr)dixLookupPrivate(&(s)->devPrivates, BarrierScreenPrivateKey))
#define GetBarrierScreenIfSet(s) GetBarrierScreen(s)
#define SetBarrierScreen(s,p) dixSetPrivate(&(s)->devPrivates, BarrierScreenPrivateKey, p)
#define GetBarrierScreenIfSet(s) GetBarrierScreen((s))
#define SetBarrierScreen(s,p) dixSetPrivate(&(s)->devPrivates, BarrierScreenPrivateKey, (p))

static struct PointerBarrierDevice *AllocBarrierDevice(void)
{
Expand Down Expand Up @@ -209,7 +209,7 @@ inside_segment(int v, int v1, int v2)
return v >= v1 && v <= v2;
}

#define T(v, a, b) (((float)v) - (a)) / ((b) - (a))
#define T(v, a, b) (((float)(v)) - (a)) / ((b) - (a))
#define F(t, a, b) ((t) * ((a) - (b)) + (a))

/**
Expand Down
Loading