Merge pull request #118 from eddelbuettel/master

Switch one PI to M_PI to support STRICT_R_HEADERS
r-spatial · Jun 2, 2021 · e39716e · e39716e
2 parents 6e344ad + d5cbc99
commit e39716e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,4 +1,4 @@
-PKG_CPPFLAGS = -I../inst/include
+PKG_CPPFLAGS = -I../inst/include -DSTRICT_R_HEADERS
 PKG_LIBS = @libs@
 PKG_CXXFLAGS = @cflags@ -pthread
 CXX_STD = CXX11

diff --git a/src/s2-transformers.cpp b/src/s2-transformers.cpp
@@ -566,7 +566,7 @@ List cpp_s2_unary_union(List geog, List s2options) {
 
           // Check if the builder created a polygon whose boundary contained more than
           // half the earth (and invert it if so)
-          if (loop->GetArea() > (2 * PI)) {
+          if (loop->GetArea() > (2 * M_PI)) {
             loop->Invert();
           }