chiark / gitweb /
basic/macros: rename noreturn into _noreturn_ (#8456)
authorFranck Bui <fbui@suse.com>
Thu, 15 Mar 2018 05:23:46 +0000 (06:23 +0100)
committerSven Eden <yamakuzure@gmx.net>
Thu, 28 Jun 2018 07:23:09 +0000 (09:23 +0200)
commitfde3d03b393fa9429596449ea749b1de36a7b9e5
treedaff2bbf3f7c1129141e62c3e3f0338aa92c0510
parentc3227cc7ba5a8e27e35cb966ec1a1eda304d0316
basic/macros: rename noreturn into _noreturn_ (#8456)

"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.c
src/basic/log.h
src/basic/macro.h
src/basic/process-util.c
src/basic/process-util.h
src/shared/pager.c