diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-17 06:58:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-17 06:58:10 +0000 |
| commit | 748f05c2eb2bfdcc6a2768aaa8392ca1a448daa6 (patch) | |
| tree | a7153f4fc2d0d29db1f0012e419eeba727196836 | |
| parent | d5cc3a81abd0018c3b5339b75c8c6c7abd609e89 (diff) | |
| download | ruby-748f05c2eb2bfdcc6a2768aaa8392ca1a448daa6.tar.gz ruby-748f05c2eb2bfdcc6a2768aaa8392ca1a448daa6.tar.xz ruby-748f05c2eb2bfdcc6a2768aaa8392ca1a448daa6.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@18673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/ruby/backward/st.h | 6 | ||||
| -rw-r--r-- | include/ruby/backward/util.h | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
4 files changed, 22 insertions, 1 deletions
@@ -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> * transcode.c (econv_primitive_putback): new method. diff --git a/include/ruby/backward/st.h b/include/ruby/backward/st.h new file mode 100644 index 000000000..514128e61 --- /dev/null +++ b/include/ruby/backward/st.h @@ -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" diff --git a/include/ruby/backward/util.h b/include/ruby/backward/util.h new file mode 100644 index 000000000..6b47940dd --- /dev/null +++ b/include/ruby/backward/util.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" diff --git a/lib/mkmf.rb b/lib/mkmf.rb index df8861a71..c4b5b59c5 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1757,7 +1757,9 @@ def init_mkmf(config = CONFIG) $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 |