Skip to content

(master) xfixes: parentheses around macro argument symbols #2925

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
+9 −9
Open

(master) xfixes: parentheses around macro argument symbols #2925

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
8 changes: 4 additions & 4 deletions xfixes/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ static void deleteCursorHideCountsForScreen(ScreenPtr pScreen);
#define VERIFY_CURSOR(pCursor, cursor, client, access) \
do { \
int err; \
err = dixLookupResourceByType((void **) &pCursor, cursor, \
X11_RESTYPE_CURSOR, client, access); \
err = dixLookupResourceByType((void **) &(pCursor), (cursor), \
X11_RESTYPE_CURSOR, (client), (access)); \
if (err != Success) { \
client->errorValue = cursor; \
(client)->errorValue = (cursor); \
return err; \
} \
} while (0)
Expand Down Expand Up @@ -126,7 +126,7 @@ typedef struct _CursorScreen {
} CursorScreenRec, *CursorScreenPtr;

#define GetCursorScreen(s) ((CursorScreenPtr)dixLookupPrivate(&(s)->devPrivates, CursorScreenPrivateKey))
#define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = func)
#define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = (func))
#define Unwrap(as,s,elt,backup) (((backup) = (s)->elt), (s)->elt = (as)->elt)

/* The cursor doesn't show up until the first XDefineCursor() */
Expand Down
10 changes: 5 additions & 5 deletions xfixes/xfixes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ extern int XFixesErrorBase;
#define VERIFY_REGION(pRegion, rid, client, mode) \
do { \
int err; \
err = dixLookupResourceByType((void **) &pRegion, rid, \
RegionResType, client, mode); \
err = dixLookupResourceByType((void **) &(pRegion), (rid), \
RegionResType, (client), (mode)); \
if (err != Success) { \
client->errorValue = rid; \
(client)->errorValue = (rid); \
return err; \
} \
} while (0)

#define VERIFY_REGION_OR_NONE(pRegion, rid, client, mode) { \
pRegion = 0; \
if (rid) VERIFY_REGION(pRegion, rid, client, mode); \
(pRegion) = 0; \
if ((rid)) VERIFY_REGION((pRegion), (rid), (client), (mode)); \
}

extern RegionPtr
Expand Down
Loading