projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
5d93844
)
win32: Don't try to include xmath.h on newer Visual Studio
author
Nirbheek Chauhan
<nirbheek@centricular.com>
Wed, 24 Feb 2016 23:46:42 +0000
(
05:16
+0530)
committer
Tim-Philipp Müller
<tim@centricular.com>
Thu, 10 Mar 2016 10:01:19 +0000
(10:01 +0000)
gst/matroska/ebml-read.c
patch
|
blob
|
history
diff --git
a/gst/matroska/ebml-read.c
b/gst/matroska/ebml-read.c
index
a8be67a
..
56448b1
100644
(file)
--- 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