No re-map everywhere

Author: hadley

src/connection.h

@@ -1,6 +1,8 @@
 #pragma once
 
+#define R_NO_REMAP
 #include <Rinternals.h>
+#undef R_NO_REMAP
 
 #include <algorithm>
 #include <cstring>

src/init.c

@@ -1,5 +1,8 @@
-#include <R.h>
+#define R_NO_REMAP
 #include <Rinternals.h>
+#undef R_NO_REMAP
+
+#include <R.h>
 #include <stdlib.h> // for NULL
 #include <R_ext/Rdynload.h>
 

src/xml2_doc.cpp

@@ -1,4 +1,6 @@
+#define R_NO_REMAP
 #include <Rinternals.h>
+#undef R_NO_REMAP
 
 #include <libxml/parser.h>
 #include <libxml/HTMLparser.h>

src/xml2_namespace.cpp

@@ -1,4 +1,7 @@
+#define R_NO_REMAP
 #include <Rinternals.h>
+#undef R_NO_REMAP
+
 #include <libxml/tree.h>
 
 #include "xml2_types.h"

src/xml2_output.cpp

@@ -1,10 +1,12 @@
+#define R_NO_REMAP
 #include <Rinternals.h>
-#include "connection.h"
+#undef R_NO_REMAP
 
 #include <libxml/tree.h>
 #include <libxml/HTMLtree.h>
 #include <libxml/xmlsave.h>
 
+#include "connection.h"
 #include "xml2_types.h"
 #include "xml2_utils.h"
 

src/xml2_schema.cpp

@@ -3,9 +3,10 @@
 #undef R_NO_REMAP
 
 #include <libxml/xmlschemas.h>
-#include "xml2_types.h"
 #include <vector>
 #include <string>
+
+#include "xml2_types.h"
 #include "xml2_utils.h"
 
 void handleSchemaError(void* userData, xmlError* error) {

src/xml2_url.cpp

@@ -1,4 +1,6 @@
+#define R_NO_REMAP
 #include <Rinternals.h>
+#undef R_NO_REMAP
 
 #include <libxml/uri.h>
 #include "xml2_utils.h"

src/xml2_utils.h

@@ -1,7 +1,10 @@
 #ifndef __XML2_XML_UTILS__
 #define __XML2_XML_UTILS__
 
+#define R_NO_REMAP
 #include <Rinternals.h>
+#undef R_NO_REMAP
+
 #include <libxml/tree.h>
 #include <map>
 #include <string>

src/xml2_xpath.cpp

@@ -1,4 +1,7 @@
+#define R_NO_REMAP
 #include <Rinternals.h>
+#undef R_NO_REMAP
+
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/tree.h>
@@ -105,7 +108,7 @@ extern "C" SEXP xpath_search(SEXP node_sxp, SEXP doc_sxp, SEXP xpath_sxp, SEXP n
   XPtrNode node(node_sxp);
   XPtrDoc doc(doc_sxp);
   if (TYPEOF(xpath_sxp) != STRSXP) {
-    Rf_error("XPath must be a string, received %s", type2char(TYPEOF(xpath_sxp)));
+    Rf_error("XPath must be a string, received %s", Rf_type2char(TYPEOF(xpath_sxp)));
   }
   const char* xpath = CHAR(STRING_ELT(xpath_sxp, 0));