From fde3d03b393fa9429596449ea749b1de36a7b9e5 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 15 Mar 2018 06:23:46 +0100 Subject: basic/macros: rename noreturn into _noreturn_ (#8456) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "noreturn" is reserved and can be used in other header files we include: [ 16s] In file included from /usr/include/gcrypt.h:30:0, [ 16s] from ../src/journal/journal-file.h:26, [ 16s] from ../src/journal/journal-vacuum.c:31: [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2); Here we include grcrypt.h (which in turns include gpg-error.h) *after* we "noreturn" was defined in macro.h. (cherry picked from commit 848e863acc51ecfb0f3955c498874588201d9130) --- src/basic/log.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/basic/log.h') diff --git a/src/basic/log.h b/src/basic/log.h index c09e44ad5..3a3c43edc 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -188,7 +188,7 @@ int log_dump_internal( char *buffer); /* Logging for various assertions */ -noreturn void log_assert_failed_realm( +_noreturn_ void log_assert_failed_realm( LogRealm realm, const char *text, const char *file, @@ -197,7 +197,7 @@ noreturn void log_assert_failed_realm( #define log_assert_failed(text, ...) \ log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__) -noreturn void log_assert_failed_unreachable_realm( +_noreturn_ void log_assert_failed_unreachable_realm( LogRealm realm, const char *text, const char *file, -- cgit v1.2.3