From bba908fcae3cee17bf2f218de0f011eb80c8c0ae Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sun, 20 Dec 2015 13:50:13 -0600
Subject: [PATCH] Better fix for M_PI definition

Just use #define _USE_MATH_DEFINES for cmath
---
 extensions/advanced_ballistics/AdvancedBallistics.cpp | 4 ----
 extensions/common/shared.hpp                          | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extensions/advanced_ballistics/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp
index fe39f69c39..8286e054d2 100644
--- a/extensions/advanced_ballistics/AdvancedBallistics.cpp
+++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp
@@ -5,10 +5,6 @@
 #include <unordered_map>
 #include <random>
 
-//Guard for M_PI ???? ref https://github.com/acemod/ACE3/pull/2382
-#ifndef M_PI
-    #define M_PI 3.14159265358979323846f
-#endif
 
 #define GRAVITY 9.80665f
 #define ABSOLUTE_ZERO_IN_CELSIUS -273.15f
diff --git a/extensions/common/shared.hpp b/extensions/common/shared.hpp
index 6c49b99fad..ac8cebaf94 100644
--- a/extensions/common/shared.hpp
+++ b/extensions/common/shared.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+//_USE_MATH_DEFINES + cmath needs to be first or M_PI won't be defined in VS2015
+#define _USE_MATH_DEFINES
+#include <cmath>
+
 #include "targetver.h"
 #include <assert.h>
 #include <stdio.h>
@@ -11,7 +15,6 @@
 #include <map>
 #include <unordered_map>
 #include <memory>
-#include <cmath>
 #include <cstdint>
 #include <streambuf>
 #include "ace_version.hpp"