File tree Expand file tree Collapse file tree 2 files changed +31
-0
lines changed
Expand file tree Collapse file tree 2 files changed +31
-0
lines changed Original file line number Diff line number Diff line change 1+ 2015-01-15 Kevin Ushey <kevinushey@gmail.com>
2+
3+ * inst/include/RcppCommon.h: remove leaked macros
4+ 'major', 'minor' and 'makedev' from sys/sysmacros.h
5+
162015-01-08 Dirk Eddelbuettel <edd@debian.org>
27
38 * inst/examples/OpenMP/GNUmakefile: Renamed from Makefile because it
Original file line number Diff line number Diff line change 3030#include < Rcpp/config.h>
3131#include < Rcpp/macros/macros.h>
3232
33+ // include <sys/sysmacros.h>, and then remove stupid
34+ // 'major', 'minor' and 'makedev' defines. this works
35+ // around Rinternals.h eventually including this header
36+ // and letting the macros leak through
37+ #if defined(__GNUC__) && !defined(__clang__)
38+
39+ # ifdef major
40+ # warning Macro 'major' will be undefined! See https://bugzilla.redhat.com/show_bug.cgi?id=130601.
41+ # endif
42+
43+ # ifdef minor
44+ # warning Macro 'minor' will be undefined! See https://bugzilla.redhat.com/show_bug.cgi?id=130601.
45+ # endif
46+
47+ # ifdef makedev
48+ # warning Macro 'makedev' will be undefined! See https://bugzilla.redhat.com/show_bug.cgi?id=130601.
49+ # endif
50+
51+ # include < sys/sysmacros.h>
52+
53+ # undef major
54+ # undef minor
55+ # undef makedev
56+
57+ #endif
58+
3359// include R headers, but set R_NO_REMAP and access everything via Rf_ prefixes
3460#define MAXELTSIZE 8192
3561#define R_NO_REMAP
You can’t perform that action at this time.
0 commit comments