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

ruby-changes:7154

From: nobu <ko1@a...>
Date: Sun, 17 Aug 2008 15:58:24 +0900 (JST)
Subject: [ruby-changes:7154] Ruby:r18673 (trunk): * lib/mkmf.rb (init_mkmf): add include/ruby/backward to $INCFLAGS.

nobu	2008-08-17 15:58:10 +0900 (Sun, 17 Aug 2008)

  New Revision: 18673

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

  Log:
    * lib/mkmf.rb (init_mkmf): add include/ruby/backward to $INCFLAGS.
    
    * include/ruby/backward/{st,util}.h: added for backward compatibility.
      [ruby-dev:35811]

  Added directories:
    trunk/include/ruby/backward/
  Added files:
    trunk/include/ruby/backward/st.h
    trunk/include/ruby/backward/util.h
  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: include/ruby/backward/util.h
===================================================================
--- include/ruby/backward/util.h	(revision 0)
+++ include/ruby/backward/util.h	(revision 18673)
@@ -0,0 +1,6 @@
+#if   defined __GNUC__
+#warning use "ruby/util.h" instead of bare "util.h"
+#elif defined _MSC_VER || defined __BORLANDC__
+#pragma message("warning: use \"ruby/util.h\" instead of bare \"util.h\"")
+#endif
+#include "ruby/util.h"

Property changes on: include/ruby/backward/util.h
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision
Name: svn:eol-style
   + LF

Index: include/ruby/backward/st.h
===================================================================
--- include/ruby/backward/st.h	(revision 0)
+++ include/ruby/backward/st.h	(revision 18673)
@@ -0,0 +1,6 @@
+#if   defined __GNUC__
+#warning use "ruby/st.h" instead of bare "st.h"
+#elif defined _MSC_VER || defined __BORLANDC__
+#pragma message("warning: use \"ruby/st.h\" instead of bare \"st.h\"")
+#endif
+#include "ruby/st.h"

Property changes on: include/ruby/backward/st.h
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision
Name: svn:eol-style
   + LF

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18672)
+++ ChangeLog	(revision 18673)
@@ -1,3 +1,10 @@
+Sun Aug 17 15:58:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (init_mkmf): add include/ruby/backward to $INCFLAGS.
+
+	* include/ruby/backward/{st,util}.h: added for backward compatibility.
+	  [ruby-dev:35811]
+
 Sun Aug 17 13:40:04 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (econv_primitive_putback): new method.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 18672)
+++ lib/mkmf.rb	(revision 18673)
@@ -1757,7 +1757,9 @@
   $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
   $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
   $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
-  $INCFLAGS = "-I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)"
+  $INCFLAGS = "-I$(arch_hdrdir)"
+  $INCFLAGS << " -I$(hdrdir)/ruby/backward" unless $extmk
+  $INCFLAGS << " -I$(hdrdir) -I$(srcdir)"
   $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup

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

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