kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

tcltklib.c: remove RUBY_VERSION

Browse source 
* ext/tk/tcltklib.c (tcltklib_compile_info): remove RUBY_VERSION,
  use RUBY_API_VERSION instead.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-08-02 02:18:14 +00:00
parent 59cfce150b
commit f65180025b
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/tk/extconf.rb
View file

@ -2085,10 +2085,6 @@ if (TkLib_Config["tcltk-framework"] ||
$INSTALLFILES ||= [] $INSTALLFILES ||= []
$INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"] $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
# create
$defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
$defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
# remove harmful definitions. # remove harmful definitions.
$defs.delete_if{|x|/^-Du?intptr_t=/ =~ x} $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x}

19
ext/tk/tcltklib.c
View file

@ -12,11 +12,8 @@
#ifdef HAVE_RUBY_ENCODING_H #ifdef HAVE_RUBY_ENCODING_H
#include "ruby/encoding.h" #include "ruby/encoding.h"
#endif #endif
#ifndef RUBY_VERSION #ifdef HAVE_RUBY_VERSION_H
#define RUBY_VERSION "(unknown version)" #include "ruby/version.h"
#endif
#ifndef RUBY_RELEASE_DATE
#define RUBY_RELEASE_DATE "unknown release-date"
#endif #endif
#undef RUBY_UNTYPED_DATA_WARNING #undef RUBY_UNTYPED_DATA_WARNING
@ -10001,7 +9998,17 @@ tcltklib_compile_info(void)
VALUE ret; VALUE ret;
static const char info[] = static const char info[] =
"tcltklib " TCLTKLIB_RELEASE_DATE " " "tcltklib " TCLTKLIB_RELEASE_DATE " "
":: Ruby" RUBY_VERSION" ("RUBY_RELEASE_DATE") " ":: Ruby"
#ifdef RUBY_API_VERSION_MAJOR
STRINGIZE(RUBY_API_VERSION_MAJOR)"."
STRINGIZE(RUBY_API_VERSION_MINOR)"."
STRINGIZE(RUBY_API_VERSION_TEENY)" "
#else
RUBY_VERSION" "
#endif
#ifdef RUBY_RELEASE_DATE
"("RUBY_RELEASE_DATE") "
#endif
#ifdef HAVE_NATIVETHREAD #ifdef HAVE_NATIVETHREAD
"with" "with"
#else #else