Define R_NO_REMAP to avoid conflict with length() in C 17

dmurdoch · Jun 30, 2023 · 05824c7 · 05824c7
1 parent 5c3ea4a
commit 05824c7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -32,3  32,4 @@ rglClass/README.md$
 ^R/noOpenGL.R$
 [.]JSDoc
 ^CRAN-SUBMISSION$
 ^shaders.txt$
diff --git a/.gitignore b/.gitignore
@@ -11,3  11,4 @@ revdep
 dev
 src-i386
 src-x64
 shaders.txt
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5  1,5 @@
 Package: rgl
-Version: 1.1.19
 Version: 1.1.20
 Title: 3D Visualization Using OpenGL
 Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
                      email = "[email protected]"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4  1,4 @@
-# rgl 1.1.19
 # rgl 1.1.20
 
 ## Major changes
 
@@ -40,7  40,9 @@ quads properly when `meshColor == "faces"`.
 properly.
 * `addNormals()` sometimes gave `NaN` values due to rounding
 error (issue #372).
-* `arc3d()` missed plotting the last segment of the arc (issue #369).
 * `arc3d()` sometimes missed plotting the last segment of the arc (issue #369).
 * `R_NO_REMAP` has been defined to prevent conflict between 
 R internals and C  17 library.
 
 
 # rgl 1.1.3

diff --git a/src/Makevars.in b/src/Makevars.in
@@ -19,7  19,8 @@
 
 PKG_CFLAGS=$(C_VISIBILITY)
 
-PKG_CPPFLAGS=@NULL_CPPFLAGS@
 PKG_CPPFLAGS=-DR_NO_REMAP @NULL_CPPFLAGS@
 
 PKG_LIBS=@NULL_LIBS@
 
 # These lines are only used if configure found OpenGL support

diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -1,6  1,6 @@
 
 PKG_CPPFLAGS = \
-	-DHAVE_PNG_H -DHAVE_FREETYPE -Iext -Iext/ftgl -Iext/glad/include \
 	-DHAVE_PNG_H -DHAVE_FREETYPE -DR_NO_REMAP -Iext -Iext/ftgl -Iext/glad/include \
 	-I$(LOCAL_SOFT)/include/freetype2 \
 	-DRGL_W32
 

diff --git a/src/Makevars.win.in b/src/Makevars.win.in
@@ -2,7  2,7 @@
 # when this file is used instead of Makevars.ucrt:
 
 PKG_CPPFLAGS = \
-	-DHAVE_PNG_H -DHAVE_FREETYPE -Iext -Iext/ftgl -Iext/glad/include \
 	-DHAVE_PNG_H -DHAVE_FREETYPE -DR_NO_REMAP -Iext -Iext/ftgl -Iext/glad/include \
 	-I$(LOCAL_SOFT)/include/freetype2 \
 	-DRGL_W32
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,3 11,4 @@ revdep @@
     dev
     src-i386
     src-x64
+    shaders.txt