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

ruby-changes:6264

From: shyouhei <ko1@a...>
Date: Tue, 1 Jul 2008 21:13:33 +0900 (JST)
Subject: [ruby-changes:6264] Ruby:r17778 (trunk): * lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,

shyouhei	2008-07-01 21:13:13 +0900 (Tue, 01 Jul 2008)

  New Revision: 17778

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

  Log:
    * lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,
      namely inclusion of ruby.h, because _GNU_SOURCE is now defined
     	  there (if any) and socket.so requires it on Linux systems.
    



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

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17778&r2=17777&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=17778&r2=17777&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17777)
+++ ChangeLog	(revision 17778)
@@ -1,3 +1,9 @@
+Tue Jul  1 21:09:58 2008  URABE Shyouhei  <shyouhei@r...>
+
+	* lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,
+	  namely inclusion of ruby.h, because _GNU_SOURCE is now defined
+	  there (if any) and socket.so requires it on Linux systems.
+
 Tue Jul  1 20:55:07 2008  URABE Shyouhei  <shyouhei@r...>
 
 	* eval.c (rb_interrupt): trick to suppress GCC warning.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 17777)
+++ lib/mkmf.rb	(revision 17778)
@@ -321,6 +321,7 @@
 
 def create_tmpsrc(src)
   src = yield(src) if block_given?
+  src[0, 0] = COMMON_HEADERS + "\n"
   src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
   count = 0
   begin
@@ -1843,7 +1844,7 @@
 
 EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
 
-hdr = []
+hdr = ['#include "ruby.h"' "\n"]
 config_string('COMMON_MACROS') do |s|
   Shellwords.shellwords(s).each do |w|
     hdr << "#define " + w.split(/=/, 2).join(" ")

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

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