Use _X_NORETURN from xproto 7.0.17 instead of checking __GNUC__.

2 files changed, 4 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index efe6cea..9953e5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Obtain compiler/linker options for the transset dependencies
-PKG_CHECK_MODULES(TRANSSET, xproto x11)
+PKG_CHECK_MODULES(TRANSSET, x11 xproto >= 7.0.17)
 
 AC_CONFIG_FILES([
 	Makefile
diff --git a/dsimple.h b/dsimple.h
index 4b201b3..349cb9b 100644
--- a/dsimple.h
+++ b/dsimple.h
@@ -37,6 +37,8 @@ from The Open Group.
  * Send bugs, etc. to chariot@athena.mit.edu.
  */
 
+#include <X11/Xfuncproto.h>
+
 extern char *program_name;                   /* Name of this program */
 extern Display *dpy;                         /* The current display */
 extern int screen;                           /* The current screen */
@@ -62,8 +64,4 @@ Window Select_Window (Display *);
 Window Get_Window_Under_Cursor (Display *); /*added by Daniel Forchheimer for transset-df*/
 Window Window_With_Name (Display *, Window, char *);
 Window Window_With_Name_Regex (Display *, Window, char *); /*added by Daniel Forchheimer for transset-df*/
-#ifdef __GNUC__
-void Fatal_Error (char *, ...) __attribute__((__noreturn__));
-#else
-void Fatal_Error (char *, ...);
-#endif
+void Fatal_Error (char *, ...) _X_NORETURN;