summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-13 07:03:23 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-13 07:03:23 +0000
commitd42e547ab1a487a00ccd4f71604b58e1cce060eb (patch)
tree08de5c510fb68cc9c671adeb1f1764a1431471e1
parentfc4b2d922839769b2e12f3ccbf384ba923f97c90 (diff)
* math.c (_USE_MATH_DEFINES): it must be set before including internal.h
because internal.h includes ruby.h, ruby.h includes win32.h, and win32.h includes system's math.h. this change is to get rid of a compiler warning (redefinition of a macro) introduced at r55641. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--math.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dff90758b0..97443227e8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jul 13 15:59:59 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * math.c (_USE_MATH_DEFINES): it must be set before including internal.h
+ because internal.h includes ruby.h, ruby.h includes win32.h, and
+ win32.h includes system's math.h.
+ this change is to get rid of a compiler warning (redefinition of
+ a macro) introduced at r55641.
+
Wed Jul 13 15:19:03 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if
diff --git a/math.c b/math.c
index 87d487d8a6e..a781167d5e1 100644
--- a/math.c
+++ b/math.c
@@ -9,10 +9,10 @@
**********************************************************************/
-#include "internal.h"
#ifdef _MSC_VER
# define _USE_MATH_DEFINES 1
#endif
+#include "internal.h"
#include <float.h>
#include <math.h>
#include <errno.h>