aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 12:04:25 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 12:04:25 +0100
commit176f9b471b2ec67dd95e054d9a22ab87c8110b7c (patch)
treedeae1ad544bd1a7eb585e60ae612aaa7ae63744f /nx-X11
parentd156ce5ab6afa3bc67189f4985e1517d5aca52b3 (diff)
parent7c8214f31fd3d83e641067941573ebb89f4f4ddb (diff)
downloadnx-libs-176f9b471b2ec67dd95e054d9a22ab87c8110b7c.tar.gz
nx-libs-176f9b471b2ec67dd95e054d9a22ab87c8110b7c.tar.bz2
nx-libs-176f9b471b2ec67dd95e054d9a22ab87c8110b7c.zip
Merge branch 'uli42-pr/fix_clang_warnings' into 3.6.x
Attributes GH PR #763: https://github.com/ArcticaProject/nx-libs/pull/763
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/lib/include/X11/Xlibint.h18
-rw-r--r--nx-X11/lib/src/xkb/XKBBind.c2
2 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/lib/include/X11/Xlibint.h b/nx-X11/lib/include/X11/Xlibint.h
index d38c87ee3..ce20b9a3d 100644
--- a/nx-X11/lib/include/X11/Xlibint.h
+++ b/nx-X11/lib/include/X11/Xlibint.h
@@ -709,12 +709,12 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len)
extern int _XData32(
Display *dpy,
- register _Xconst long *data,
+ _Xconst long *data,
unsigned len
);
extern void _XRead32(
Display *dpy,
- register long *data,
+ long *data,
long len
);
#else
@@ -1415,10 +1415,10 @@ extern int _XF86LoadQueryLocaleFont(
);
extern void _XProcessWindowAttributes (
- register Display *dpy,
+ Display *dpy,
xChangeWindowAttributesReq *req,
- register unsigned long valuemask,
- register XSetWindowAttributes *attributes);
+ unsigned long valuemask,
+ XSetWindowAttributes *attributes);
extern int _XDefaultError(
Display *dpy,
@@ -1428,7 +1428,7 @@ extern int _XDefaultIOError(
Display *dpy);
extern void _XSetClipRectangles (
- register Display *dpy,
+ Display *dpy,
GC gc,
int clip_x_origin, int clip_y_origin,
XRectangle *rectangles,
@@ -1436,13 +1436,13 @@ extern void _XSetClipRectangles (
int ordering);
Status _XGetWindowAttributes(
- register Display *dpy,
+ Display *dpy,
Window w,
XWindowAttributes *attr);
int _XPutBackEvent (
- register Display *dpy,
- register XEvent *event);
+ Display *dpy,
+ XEvent *event);
extern Bool _XIsEventCookie(
Display *dpy,
diff --git a/nx-X11/lib/src/xkb/XKBBind.c b/nx-X11/lib/src/xkb/XKBBind.c
index c679dc552..068e8f2a0 100644
--- a/nx-X11/lib/src/xkb/XKBBind.c
+++ b/nx-X11/lib/src/xkb/XKBBind.c
@@ -165,7 +165,7 @@ XKeysymToKeycode(Display *dpy, KeySym ks)
for (i = dpy->min_keycode; i <= dpy->max_keycode; i++) {
if (j < (int) XkbKeyNumSyms(xkb, i)) {
gotOne = 1;
- if ((XkbKeySym(xkb, i, j) == ks))
+ if (XkbKeySym(xkb, i, j) == ks)
return i;
}
}