From d8a422955ded35ea79b117856a8e21f6257b0129 Mon Sep 17 00:00:00 2001
From: David Williams <david@volumesoffun.com>
Date: Fri, 8 May 2015 15:04:17 +0200
Subject: [PATCH] Now that PolyVox is header only we have no further use for
 the POLYVOX_API/LOCAL/SHARED macros which wrap API import/export.

---
 include/PolyVox/CubicSurfaceExtractor.h         |  2 +-
 include/PolyVox/GradientEstimators.h            |  4 ++--
 include/PolyVox/Impl/PlatformDefinitions.h      | 16 ----------------
 include/PolyVox/MarchingCubesSurfaceExtractor.h |  2 +-
 include/PolyVox/Region.h                        |  2 +-
 include/PolyVox/Vertex.h                        |  2 +-
 6 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/include/PolyVox/CubicSurfaceExtractor.h b/include/PolyVox/CubicSurfaceExtractor.h
index 19d1514d..e43291fa 100644
--- a/include/PolyVox/CubicSurfaceExtractor.h
+++ b/include/PolyVox/CubicSurfaceExtractor.h
@@ -40,7 +40,7 @@ namespace PolyVox
 	struct CubicVertex
 #else
 	template<typename _DataType>
-	struct POLYVOX_API CubicVertex
+	struct  CubicVertex
 #endif
 	{
 		typedef _DataType DataType;
diff --git a/include/PolyVox/GradientEstimators.h b/include/PolyVox/GradientEstimators.h
index 30ea14ab..7a293693 100644
--- a/include/PolyVox/GradientEstimators.h
+++ b/include/PolyVox/GradientEstimators.h
@@ -55,8 +55,8 @@ namespace PolyVox
 	template<typename VolumeType>
 	Vector3DFloat computeSmoothSobelGradient(typename VolumeType::Sampler& volIter);
 
-	//POLYVOX_API void computeNormalsForVertices(VolumeType<uint8_t>* volumeData, Mesh<PositionMaterialNormal>& mesh, NormalGenerationMethod normalGenerationMethod);
-	//POLYVOX_API Vector3DFloat computeNormal(VolumeType<uint8_t>* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod);
+	// void computeNormalsForVertices(VolumeType<uint8_t>* volumeData, Mesh<PositionMaterialNormal>& mesh, NormalGenerationMethod normalGenerationMethod);
+	// Vector3DFloat computeNormal(VolumeType<uint8_t>* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod);
 }
 
 #include "PolyVox/GradientEstimators.inl"
diff --git a/include/PolyVox/Impl/PlatformDefinitions.h b/include/PolyVox/Impl/PlatformDefinitions.h
index f020aad0..fb55dbdf 100644
--- a/include/PolyVox/Impl/PlatformDefinitions.h
+++ b/include/PolyVox/Impl/PlatformDefinitions.h
@@ -59,22 +59,6 @@ freely, subject to the following restrictions:
   #define POLYVOX_DEPRECATED //Define it to nothing to avoid warnings
 #endif
 
-// Now we use the generic helper definitions above to define POLYVOX_API and POLYVOX_LOCAL.
-// POLYVOX_API is used for the public API symbols. It either imports or exports (or does nothing for static build)
-// POLYVOX_LOCAL is used for non-api symbols.
-
-#ifdef POLYVOX_SHARED // defined if PolyVox is compiled as a shared library
-  #ifdef POLYVOX_SHARED_EXPORTS // defined if we are building the PolyVox shared library (instead of using it)
-    #define POLYVOX_API POLYVOX_HELPER_EXPORT
-  #else
-    #define POLYVOX_API POLYVOX_HELPER_IMPORT
-  #endif // POLYVOX_SHARED_EXPORTS
-  #define POLYVOX_LOCAL POLYVOX_HELPER_LOCAL
-#else // POLYVOX_SHARED is not defined: this means PolyVox is a static library.
-  #define POLYVOX_API
-  #define POLYVOX_LOCAL
-#endif // POLYVOX_SHARED
-
 #if defined(_MSC_VER)
 	// In Visual Studio we can use this function to go into the debugger.
 	#define POLYVOX_HALT() __debugbreak()
diff --git a/include/PolyVox/MarchingCubesSurfaceExtractor.h b/include/PolyVox/MarchingCubesSurfaceExtractor.h
index 6946f68d..85539885 100644
--- a/include/PolyVox/MarchingCubesSurfaceExtractor.h
+++ b/include/PolyVox/MarchingCubesSurfaceExtractor.h
@@ -39,7 +39,7 @@ namespace PolyVox
 	struct MarchingCubesVertex
 #else
 	template<typename _DataType>
-	struct POLYVOX_API MarchingCubesVertex
+	struct  MarchingCubesVertex
 #endif
 	{
 		typedef _DataType DataType;
diff --git a/include/PolyVox/Region.h b/include/PolyVox/Region.h
index bd44af8a..108f1110 100644
--- a/include/PolyVox/Region.h
+++ b/include/PolyVox/Region.h
@@ -52,7 +52,7 @@ namespace PolyVox
 #ifdef SWIG
 	class Region
 #else
-	class POLYVOX_API Region
+	class  Region
 #endif
 	{
 	public:
diff --git a/include/PolyVox/Vertex.h b/include/PolyVox/Vertex.h
index 34d524fc..f66164df 100644
--- a/include/PolyVox/Vertex.h
+++ b/include/PolyVox/Vertex.h
@@ -37,7 +37,7 @@ namespace PolyVox
 	struct Vertex
 #else
 	template<typename _DataType>
-	struct POLYVOX_API Vertex
+	struct  Vertex
 #endif
 	{
 		typedef _DataType DataType;