Skip to content

Commit

Permalink
ensure NORET macro defined, for older Rs (#512)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinushey committed Jul 20, 2016
1 parent 8c64530 commit a2e45fa
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,3 +1,8 @@
2016-07-18 Kevin Ushey <kevin@rstudio.com>

* inst/include/r/headers.h: Ensure NORET macro set appropriately


2016-07-18 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION: Release 0.12.6
Expand Down
6 changes: 6 additions & 0 deletions inst/include/Rcpp/r/headers.h
Expand Up @@ -56,6 +56,12 @@
#include <R_ext/Rdynload.h>
#include <Rversion.h>

#if defined(__GNUC__) && __GNUC__ >= 3
#define NORET __attribute__((noreturn))
#else
#define NORET
#endif

This comment has been minimized.

Copy link
@eddelbuettel

eddelbuettel Jul 20, 2016

Member

Can we / should we make this conditional? Say #ifndef NORET <as before...>. #endif?

This comment has been minimized.

Copy link
@kevinushey

kevinushey Jul 20, 2016

Author Contributor

Yes, we should -- thanks for pointing that out!

This comment has been minimized.

Copy link
@eddelbuettel

eddelbuettel Jul 20, 2016

Member

While you're at it please open a new block in NEWS.Rd for 0.12.7 as well and add this.

#undef major
#undef minor
#undef makedev
Expand Down

0 comments on commit a2e45fa

Please sign in to comment.