[PATCH:xprop 3/3] Use _X_NORETURN from xproto 7.0.17 instead of local check

Alan Coopersmith alan.coopersmith at oracle.com
Fri Jan 28 22:03:58 PST 2011


Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac |    2 +-
 dsimple.h    |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0462836..147d733 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ XORG_DEFAULT_OPTIONS
 AC_CHECK_HEADERS([wchar.h wctype.h langinfo.h])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XPROP, x11)
+PKG_CHECK_MODULES(XPROP, [x11 xproto >= 7.0.17])
 
 XORG_WITH_LINT
 
diff --git a/dsimple.h b/dsimple.h
index b9e9a66..ae77a30 100644
--- a/dsimple.h
+++ b/dsimple.h
@@ -37,6 +37,8 @@ from The Open Group.
  * Send bugs, etc. to chariot at athena.mit.edu.
  */
 
+#include <X11/Xfuncproto.h>
+
     /* Simple helper macros */
 #ifndef MAX
 #define MAX(a,b) (((a)>(b))?(a):(b))
@@ -77,8 +79,5 @@ void usage(void);
 
 Window Select_Window(Display *, int descend);
 Window Window_With_Name(Display *, Window, const char *);
-#ifdef __GNUC__
-void Fatal_Error(char *, ...) __attribute__((__noreturn__));
-#else
-void Fatal_Error(char *, ...);
-#endif
+
+void Fatal_Error(char *, ...) _X_NORETURN;
-- 
1.7.3.2



More information about the xorg-devel mailing list