diff options
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/configure.ac | 2 | ||||
| -rw-r--r-- | libX11/include/X11/Xlibint.h | 2 | ||||
| -rw-r--r-- | libX11/src/xkb/XKBGeom.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index 8a0a4faa8..13d0188c7 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -77,7 +77,7 @@ AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno) # Checks for pkg-config packages
# Always required
-X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans xcb >= 1.1.92'
+X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.1.92'
X11_EXTRA_DEPS="xcb >= 1.1.92"
PKG_PROG_PKG_CONFIG()
diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h index 78d459e6d..39ca4da03 100644 --- a/libX11/include/X11/Xlibint.h +++ b/libX11/include/X11/Xlibint.h @@ -899,7 +899,7 @@ extern int _XError( );
extern int _XIOError(
Display* /* dpy */
-);
+) _X_NORETURN;
extern int (*_XIOErrorFunction)(
Display* /* dpy */
);
diff --git a/libX11/src/xkb/XKBGeom.c b/libX11/src/xkb/XKBGeom.c index 065285fcb..d8fe3ce32 100644 --- a/libX11/src/xkb/XKBGeom.c +++ b/libX11/src/xkb/XKBGeom.c @@ -108,7 +108,6 @@ XkbBoundsPtr bounds,sbounds; if ((!geom)||(!section)||(!row))
return False;
- pos= 0;
bounds= &row->bounds;
bzero(bounds,sizeof(XkbBoundsRec));
for (key=row->keys,pos=k=0;k<row->num_keys;k++,key++) {
@@ -143,7 +142,7 @@ register int i; XkbShapePtr shape;
XkbRowPtr row;
XkbDoodadPtr doodad;
-XkbBoundsPtr bounds,rbounds=NULL;
+XkbBoundsPtr bounds,rbounds;
if ((!geom)||(!section))
return False;
@@ -182,6 +181,7 @@ XkbBoundsPtr bounds,rbounds=NULL; default:
tbounds.x1= tbounds.x2= doodad->any.left;
tbounds.y1= tbounds.y2= doodad->any.top;
+ rbounds= &tbounds;
break;
}
_XkbCheckBounds(bounds,rbounds->x1,rbounds->y1);
|