- Fix compile when the compiler does not support the noreturn

attribute.
NLnetLabs · Jul 23, 2024 · 8de5ae3 · 8de5ae3
1 parent 5bea29b
commit 8de5ae3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/configure b/configure
@@ -7023,6 +7023,10 @@ printf "%s\n" "#define HAVE_ATTR_NORETURN 1" >>confdefs.h
 
 printf "%s\n" "#define ATTR_NORETURN __attribute__((__noreturn__))" >>confdefs.h
 
+else
+
+printf "%s\n" "#define ATTR_NORETURN /**/" >>confdefs.h
+
 fi
 
 

diff --git a/configure.ac b/configure.ac
@@ -360,6 +360,8 @@ AC_MSG_RESULT($ac_cv_c_noreturn_attribute)
 if test $ac_cv_c_noreturn_attribute = yes; then
   AC_DEFINE(HAVE_ATTR_NORETURN, 1, [Whether the C compiler accepts the "noreturn" attribute])
   AC_DEFINE(ATTR_NORETURN, [__attribute__((__noreturn__))], [apply the noreturn attribute to a function that exits the program])
+else
+  AC_DEFINE(ATTR_NORETURN,[], [apply the noreturn attribute to a function that exits the program])
 fi
 ])dnl End of CHECK_NORETURN_ATTRIBUTE
 

diff --git a/doc/Changelog b/doc/Changelog
@@ -5,6 +5,8 @@
 	- Merge #1110: Make fallthrough explicit for libworker.c.
 	- For #1110: Test for fallthrough attribute in configure and add
 	  fallthrough attribute annotations.
+	- Fix compile when the compiler does not support the noreturn
+	  attribute.
 
 19 July 2024: Wouter
 	- Add dnstap-sample-rate that logs only 1/N messages, for high volume
-Original file line number
+Diff line change
@@ Expand Up @@
     printf "%s\n" "#define ATTR_NORETURN __attribute__((__noreturn__))" >>confdefs.h
+    else
+    printf "%s\n" "#define ATTR_NORETURN /**/" >>confdefs.h
     fi
@@ Expand Down @@