[前][次][番号順一覧][スレッド一覧]

ruby-changes:43589

From: usa <ko1@a...>
Date: Wed, 13 Jul 2016 16:03:28 +0900 (JST)
Subject: [ruby-changes:43589] usa:r55662 (trunk): * math.c (_USE_MATH_DEFINES): it must be set before including internal.h

usa	2016-07-13 16:03:23 +0900 (Wed, 13 Jul 2016)

  New Revision: 55662

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55662

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/math.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55661)
+++ ChangeLog	(revision 55662)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jul 13 15:59:59 2016  NAKAMURA Usaku  <usa@r...>
+
+	* 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@i...>
 
 	* enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if
Index: math.c
===================================================================
--- math.c	(revision 55661)
+++ math.c	(revision 55662)
@@ -9,10 +9,10 @@ https://github.com/ruby/ruby/blob/trunk/math.c#L9
 
 **********************************************************************/
 
-#include "internal.h"
 #ifdef _MSC_VER
 # define _USE_MATH_DEFINES 1
 #endif
+#include "internal.h"
 #include <float.h>
 #include <math.h>
 #include <errno.h>

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]