[PATCH libX11 1/3] Annotate _XIOError as _X_NORETURN

Jeremy Huddleston jeremyhu at apple.com
Wed May 4 11:50:13 PDT 2011


Found-by: clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
 configure.ac          |    2 +-
 include/X11/Xlibint.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce86c93..a39ab8d 100644
--- a/configure.ac
+++ b/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/include/X11/Xlibint.h b/include/X11/Xlibint.h
index d199a8b..3266e0d 100644
--- a/include/X11/Xlibint.h
+++ b/include/X11/Xlibint.h
@@ -899,7 +899,7 @@ extern int _XError(
 );
 extern int _XIOError(
     Display*	/* dpy */
-);
+) _X_NORETURN;
 extern int (*_XIOErrorFunction)(
     Display*	/* dpy */
 );
-- 
1.7.4.1




More information about the xorg-devel mailing list