More Rcpp work-arounds.

git-svn-id: https://svn.r-project.org/R/trunk@89115 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: luke

src/include/R_ext/Callbacks.h

@@ -29,10 +29,15 @@
 #define R_FAKE_CALLBACKS_H
 
 // new code should include R_ext/ObjectTable.h directly
-#if ! defined(RcppCommon_h)
+#ifdef RcppCommon_h
+# if RCPP_VERSION > Rcpp_Version(1,1,0)
+#warning include R_ext/ObjectTable.h for R_ObjectTable declarations
+# endif
+#else
 #warning include R_ext/ObjectTable.h for R_ObjectTable declarations
 #endif
 
+// to ease the transition from R_ext/Callbacks.h to R_ext/ObjectTable.h
 #include <R_ext/ObjectTable.h>
 
 #endif /* R_FAKE_CALLBACKS_H */

src/include/R_ext/PrtUtil.h

@@ -27,8 +27,15 @@
 #ifndef FAKE_PRTUTIL_H_
 #define FAKE_PRTUTIL_H_
 
-#if ! defined(COMPILING_RCPP)
+#ifdef COMPILING_RCPP
+# if RCPP_VERSION > Rcpp_Version(1,1,0)
+#warning non-API header file R_ext/PrtUtil.h is obsolete and will be removed
+# endif
+#else
 #warning non-API header file R_ext/PrtUtil.h is obsolete and will be removed
 #endif
 
+// for packages relying on the old R_ext/PrtUtil.h bringing this in
+#include <Rinternals.h>
+
 #endif /* FAKE_PRTUTIL_H_ */