better workaround re: macro leakage from Rinterals -> sysmacros chain

Author: kevinushey

.gitignore

@@ -9,3 +9,4 @@ src/*.dll
 Rcpp.pro
 Rcpp.pro.user
 *.autosave
+.#*

ChangeLog

@@ -1,3 +1,10 @@
+2015-01-19  Kevin Ushey  <[email protected]>
+
+        * inst/include/Rcpp/r/headers.h: move R headers inclusion to own file;
+        move sysmacros.h workarounds to here
+        * inst/include/RcppCommon.h: idem
+        * inst/include/Rcpp/platform/sysmacros.h: idem
+
 2015-01-19  Dirk Eddelbuettel  <[email protected]>
 
         * vignettes/Rcpp.bib: Updated to current package versions

inst/include/Rcpp/platform/sysmacros.h

@@ -0,0 +1,71 @@
+// headers.h: Rcpp R/C++ interface class library -- R headers
+//
+// Copyright (C) 2008 - 2009 Dirk Eddelbuettel
+// Copyright (C) 2009 - 2013 Dirk Eddelbuettel and Romain Francois
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef RCPP__R__HEADERS__H
+#define RCPP__R__HEADERS__H
+
+// include R headers, but set R_NO_REMAP and access everything via Rf_ prefixes
+#define MAXELTSIZE 8192
+#define R_NO_REMAP
+
+// prevent some macro pollution when including R headers
+// in particular, on Linux, gcc 'leaks' the 'major',
+// 'minor' and 'makedev' macros on Linux; we prevent
+// letting those leak in after including any R headers
+
+#ifdef major
+# define RCPP_HAS_MAJOR_MACRO
+# pragma push_macro("major")
+#endif
+
+#ifdef minor
+# define RCPP_HAS_MINOR_MACRO
+# pragma push_macro("minor")
+#endif
+
+#ifdef makedev
+# define RCPP_HAS_MAKEDEV_MACRO
+# pragma push_macro("makedev")
+#endif
+
+#include <R.h>
+#include <Rinternals.h>
+#include <R_ext/Complex.h>
+#include <R_ext/Parse.h>
+#include <R_ext/Rdynload.h>
+#include <Rversion.h>
+
+#undef major
+#undef minor
+#undef makedev
+
+#ifdef RCPP_HAS_MAJOR_MACRO
+# pragma pop_macro("major")
+#endif
+
+#ifdef RCPP_HAS_MINOR_MACRO
+# pragma pop_macro("minor")
+#endif
+
+#ifdef RCPP_HAS_MAKEDEV_MACRO
+# pragma pop_macro("makedev")
+#endif
+
+#endif /* RCPP__R__HEADERS__H */

inst/include/Rcpp/r/headers.h

@@ -30,17 +30,8 @@
 #include <Rcpp/config.h>
 #include <Rcpp/macros/macros.h>
 
-#include <Rcpp/platform/sysmacros.h>
-
-// include R headers, but set R_NO_REMAP and access everything via Rf_ prefixes
-#define MAXELTSIZE 8192
-#define R_NO_REMAP
-#include <R.h>
-#include <Rinternals.h>
-#include <R_ext/Complex.h>
-#include <R_ext/Parse.h>
-#include <R_ext/Rdynload.h>
-#include <Rversion.h>
+
+#include <Rcpp/r/headers.h>
 
 /**
  * \brief Rcpp API