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

* ext/tk/extconf.rb: log() is built-in in some compilers and needs

proper declaration.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-03-11 21:49:02 +00:00
parent 831eb93069
commit de850442f2
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Fri Mar 12 06:48:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/extconf.rb: log() is built-in in some compilers and needs
proper declaration.
Fri Mar 12 06:37:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Mar 12 06:37:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sample/timeout.rb: split from lib/timeout.rb. * sample/timeout.rb: split from lib/timeout.rb.

View file

@ -634,7 +634,7 @@ def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
TkLib_Config["tclConfig-dir"] = tclConfig_dir TkLib_Config["tclConfig-dir"] = tclConfig_dir
TkLib_Config["tkConfig-dir"] = tkConfig_dir TkLib_Config["tkConfig-dir"] = tkConfig_dir
print("Search tclConfig.sh and tkConfig.sh.") print("Search tclConfig.sh and tkConfig.sh in #{tclConfig_dir}.")
if tclConfig_dir if tclConfig_dir
tclConfig, tkConfig = tclConfig, tkConfig =
search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir), search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir),
@ -1273,7 +1273,7 @@ unless is_win32?
print(".") # progress print(".") # progress
have_library("dl", "dlopen") have_library("dl", "dlopen")
print(".") # progress print(".") # progress
have_library("m", "log") have_library("m", "log", "math.h")
print("\n") # progress print("\n") # progress
end end
$CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM