зеркало из https://github.com/github/ruby.git
* lib/mkmf.rb (init_mkmf): add include/ruby/backward to $INCFLAGS.
* include/ruby/backward/{st,util}.h: added for backward compatibility. [ruby-dev:35811] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
14a87b4f49
Коммит
ccdf3f1162
|
@ -1,3 +1,10 @@
|
||||||
|
Sun Aug 17 15:58:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* 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@fsij.org>
|
Sun Aug 17 13:40:04 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* transcode.c (econv_primitive_putback): new method.
|
* transcode.c (econv_primitive_putback): new method.
|
||||||
|
|
|
@ -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"
|
|
@ -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"
|
|
@ -1757,7 +1757,9 @@ def init_mkmf(config = CONFIG)
|
||||||
$ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
|
$ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
|
||||||
$CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
|
$CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
|
||||||
$LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).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
|
$DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
|
||||||
$LIBEXT = config['LIBEXT'].dup
|
$LIBEXT = config['LIBEXT'].dup
|
||||||
$OBJEXT = config["OBJEXT"].dup
|
$OBJEXT = config["OBJEXT"].dup
|
||||||
|
|
Загрузка…
Ссылка в новой задаче