From a2fc726a6225ceb94dba367cf5acfe597ce11d74 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Thu, 29 Nov 2018 21:25:44 +0100
Subject: A bunch of stuff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 libsimple-arg.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'libsimple-arg.h')

diff --git a/libsimple-arg.h b/libsimple-arg.h
index 1f4291c..983f4c8 100644
--- a/libsimple-arg.h
+++ b/libsimple-arg.h
@@ -398,8 +398,19 @@ struct longopt {
 #define USAGE(SYNOPSIS)\
 	NUSAGE(1, SYNOPSIS)
 
+
+/* Intended for internal use only */
+#if __STDC_VERSION__ >= 201112L
+# define _LIBSIMPLE_NORETURN _Noreturn
+#elif defined(__GNUC__) || defined(__clang__)
+# define _LIBSIMPLE_NORETURN __attribute__((noreturn))
+#else
+# define _LIBSIMPLE_NORETURN
+#endif
+
+
 /**
- * Define the function `static void usage(void)`
+ * Define the function `static _Noreturn void usage(void)`
  * that prints the error message
  *         "usage: %s %s\n", argv0, SYNOPSIS
  * or
@@ -412,26 +423,15 @@ struct longopt {
  * @param  SYNOPSIS:const char *  Description of the command line argument syntax
  * @parma  STATUS:int             The exit value for the process
  */
-#if defined(__GNUC__) || defined(__clang__)
-# define NUSAGE(STATUS, SYNOPSIS)\
-	__attribute__((noreturn))\
-	static void usage(void)\
-	{\
-		const char *syn = SYNOPSIS ? SYNOPSIS : "";\
-		fprintf(stderr, "usage: %s%s%s\n", argv0, *syn ? " " : "", syn);\
-		exit(STATUS);\
-	}\
-	char *argv0 = NULL
-#else
-# define NUSAGE(STATUS, SYNOPSIS)\
-	static void usage(void)\
+#define NUSAGE(STATUS, SYNOPSIS)\
+	static _LIBSIMPLE_NORETURN void\
+	usage(void)\
 	{\
 		const char *syn = SYNOPSIS ? SYNOPSIS : "";\
 		fprintf(stderr, "usage: %s%s%s\n", argv0, *syn ? " " : "", syn);\
 		exit(STATUS);\
 	}\
 	char *argv0 = NULL
-#endif
 
 
 #endif
-- 
cgit v1.2.3-70-g09d2