From ed01582433dd45390f63600874ca1403add7a562 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Fri, 10 May 2019 14:37:08 +0200
Subject: [PATCH] stfu s2 (#8960)

---
 3rdParty/s2geometry/dfefe0c/src/s2/s2polygon.h         | 2 +-
 3rdParty/s2geometry/dfefe0c/src/s2/s2region_coverer.h  | 4 ++++
 3rdParty/s2geometry/dfefe0c/src/s2/util/coding/coder.h | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/3rdParty/s2geometry/dfefe0c/src/s2/s2polygon.h b/3rdParty/s2geometry/dfefe0c/src/s2/s2polygon.h
index 6b86e28058..7d5f0cab75 100644
--- a/3rdParty/s2geometry/dfefe0c/src/s2/s2polygon.h
+++ b/3rdParty/s2geometry/dfefe0c/src/s2/s2polygon.h
@@ -48,7 +48,7 @@ class S2Error;
 class S2Loop;
 class S2PolygonBuilder;
 class S2Polyline;
-class S2XYZFaceSiTi;
+struct S2XYZFaceSiTi;
 
 // An S2Polygon is an S2Region object that represents a polygon.  A polygon is
 // defined by zero or more loops; recall that the interior of a loop is
diff --git a/3rdParty/s2geometry/dfefe0c/src/s2/s2region_coverer.h b/3rdParty/s2geometry/dfefe0c/src/s2/s2region_coverer.h
index b6c8511777..236cd5891f 100644
--- a/3rdParty/s2geometry/dfefe0c/src/s2/s2region_coverer.h
+++ b/3rdParty/s2geometry/dfefe0c/src/s2/s2region_coverer.h
@@ -28,6 +28,10 @@
 #include "s2/s2cell_id.h"
 #include "s2/s2cell_union.h"
 
+#ifdef _WIN32
+#pragma warning(disable : 4200)
+#endif
+
 class S2Region;
 
 // An S2RegionCoverer is a class that allows arbitrary regions to be
diff --git a/3rdParty/s2geometry/dfefe0c/src/s2/util/coding/coder.h b/3rdParty/s2geometry/dfefe0c/src/s2/util/coding/coder.h
index 9faf19bb20..02fb7d801d 100644
--- a/3rdParty/s2geometry/dfefe0c/src/s2/util/coding/coder.h
+++ b/3rdParty/s2geometry/dfefe0c/src/s2/util/coding/coder.h
@@ -32,6 +32,10 @@
 #include "s2/util/coding/varint.h"
 #include "s2/util/endian/endian.h"
 
+#ifdef _WIN32
+#define memccpy _memccpy
+#endif
+
 /* Class for encoding data into a memory buffer */
 class Decoder;
 class Encoder {