Cleanup macros

jeroen · jeroen · commit 3c13abc89f6a · 2025-02-27T15:16:41.000+01:00
diff --git a/inst/include/xml2_types.h b/inst/include/xml2_types.h
@@ -2,7 +2,6 @@
 #define __XML2_XML2_TYPES__
 
 #include <libxml/tree.h>
-#define R_NO_REMAP
 #include <Rinternals.h>
 
 template <typename T> class XPtr {
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,3 +1,3 @@
-PKG_CPPFLAGS=-I../inst/include @cflags@ -DUCHAR_TYPE=wchar_t -DU_SHOW_CPLUSPLUS_API=0
+PKG_CPPFLAGS=-I../inst/include @cflags@ -DUCHAR_TYPE=wchar_t -DU_SHOW_CPLUSPLUS_API=0 -DSTRICT_R_HEADERS -DR_NO_REMAP
 PKG_CXXFLAGS=$(C_VISIBILITY)
 PKG_LIBS=@libs@
diff --git a/src/connection.cpp b/src/connection.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <iterator>
 #include <vector>
 #include "xml2_utils.h"
diff --git a/src/connection.h b/src/connection.h
@@ -1,9 +1,6 @@
 #pragma once
 
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <algorithm>
 #include <cstring>
 
diff --git a/src/init.c b/src/init.c
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <stdlib.h> // for NULL
 #include <R_ext/Rdynload.h>
 
diff --git a/src/xml2_doc.cpp b/src/xml2_doc.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <libxml/parser.h>
 #include <libxml/HTMLparser.h>
 #include "xml2_types.h"
diff --git a/src/xml2_init.cpp b/src/xml2_init.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <R_ext/Rdynload.h>
 #include <stdio.h>
 #include <libxml/xmlversion.h>
diff --git a/src/xml2_namespace.cpp b/src/xml2_namespace.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <libxml/tree.h>
 
 #include "xml2_types.h"
diff --git a/src/xml2_node.cpp b/src/xml2_node.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <libxml/tree.h>
 #include <fstream>
 #include <sstream>
diff --git a/src/xml2_output.cpp b/src/xml2_output.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <libxml/tree.h>
 #include <libxml/HTMLtree.h>
 #include <libxml/xmlsave.h>
diff --git a/src/xml2_schema.cpp b/src/xml2_schema.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <libxml/xmlschemas.h>
 #include <vector>
 #include <string>
diff --git a/src/xml2_url.cpp b/src/xml2_url.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <libxml/uri.h>
 #include "xml2_utils.h"
 
diff --git a/src/xml2_utils.h b/src/xml2_utils.h
@@ -1,10 +1,7 @@
 #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>
diff --git a/src/xml2_xpath.cpp b/src/xml2_xpath.cpp
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
 #include <Rinternals.h>
-#undef R_NO_REMAP
-
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/tree.h>
diff --git a/xml2.Rproj b/xml2.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 1ff14708-efe3-4c8d-a8e6-1d8c6504bbb8
 
 RestoreWorkspace: Default
 SaveWorkspace: Default
