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

ruby-changes:25878

From: nobu <ko1@a...>
Date: Wed, 28 Nov 2012 21:22:57 +0900 (JST)
Subject: [ruby-changes:25878] nobu:r37935 (trunk): extconf.rb: mingw32

nobu	2012-11-28 21:22:47 +0900 (Wed, 28 Nov 2012)

  New Revision: 37935

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37935

  Log:
    extconf.rb: mingw32
    
    * ext/psych/extconf.rb: mingw32 also needs macros for win32, not
      only mswin32.

  Modified files:
    trunk/ChangeLog
    trunk/ext/psych/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37934)
+++ ChangeLog	(revision 37935)
@@ -1,5 +1,8 @@
-Wed Nov 28 21:21:16 2012  Nobuyoshi Nakada  <nobu@r...>
+Wed Nov 28 21:22:44 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/psych/extconf.rb: mingw32 also needs macros for win32, not
+	  only mswin32.
+
 	* ext/psych/extconf.rb: compile sources in the source directory
 	  without copying by using VPATH.
 
Index: ext/psych/extconf.rb
===================================================================
--- ext/psych/extconf.rb	(revision 37934)
+++ ext/psych/extconf.rb	(revision 37935)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 require 'mkmf'
 require 'fileutils'
 
@@ -13,8 +14,8 @@
 
   $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}
 
-  if $mswin
-    $CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
+  if have_macro("_WIN32")
+    $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
   end
 
   have_header 'dlfcn.h'

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

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