summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-02-25 05:16:42 +0530
committerTim-Philipp Müller <tim@centricular.com>2016-03-10 10:01:19 +0000
commit63803bfac086035368ecd3314439bb7321769ce2 (patch)
treea7e304f8fed8d76535f4160ec288da35e16b124a
parent5d93844676cb8c5f270a5b107f217754bbb10a37 (diff)
downloadgstreamer-plugins-good-63803bfac086035368ecd3314439bb7321769ce2.tar.gz
win32: Don't try to include xmath.h on newer Visual Studio
-rw-r--r--gst/matroska/ebml-read.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index a8be67a56..56448b10b 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -30,8 +30,9 @@
#include <math.h>
-/* NAN is supposed to be in math.h, Microsoft defines it in xmath.h */
-#ifdef _MSC_VER
+/* NAN is supposed to be in math.h, Microsoft defines it in xmath.h
+ * However, starting iwth Visual Studio 8, NAN is defined by default */
+#if defined (_MSC_VER) && _MSC_VER < 1500
#include <xmath.h>
#endif