aboutsummaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-26 12:34:51 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-26 12:34:51 +0000
commitfe98a03c532936b80199e84fc5d94bbe295bdaf0 (patch)
tree7179a181837c46be7f1fc15b7fc1b9cf27a64927 /ext
parentb71cab7fa071bc2ed369526e7c579f4928c04ed4 (diff)
downloadruby-fe98a03c532936b80199e84fc5d94bbe295bdaf0.tar.gz
* ext/socket/extconf.rb: suppress a warning.
* ext/extmk.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/extmk.rb16
-rw-r--r--ext/socket/extconf.rb2
2 files changed, 9 insertions, 9 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 6715bcee3b..ab48634c1a 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -267,7 +267,7 @@ def parse_args()
if arg = v.first
arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
end
- $makeflags.concat(v.reject {|arg| /\AMINIRUBY=/ =~ arg}.quote)
+ $makeflags.concat(v.reject {|arg2| /\AMINIRUBY=/ =~ arg2}.quote)
$mflags.concat(v)
end
opts.on('--message [MESSAGE]', String) do |v|
@@ -570,19 +570,19 @@ $mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT")
if $command_output
message = "echo #{message}"
- cmd = $makeflags.map {|s|s.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ')
- open($command_output, 'wb') do |f|
+ cmd = $makeflags.map {|ss|ss.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ')
+ open($command_output, 'wb') do |ff|
case $command_output
when /\.sh\z/
- f.puts message, "rm -f $0; exec \"$@\" #{cmd}"
+ ff.puts message, "rm -f $0; exec \"$@\" #{cmd}"
when /\.bat\z/
- ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |s|
- f.print s, "\r\n"
+ ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |ss|
+ ff.print ss, "\r\n"
end
else
- f.puts cmd
+ ff.puts cmd
end
- f.chmod(0755)
+ ff.chmod(0755)
end
else
puts message
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index bebbf97ac7..20952e31f6 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -107,7 +107,7 @@ if have_struct_member("struct sockaddr", "sa_len", headers)
$defs[-1] = "-DHAVE_SA_LEN "
end
-have_header("netinet/tcp.h") if not /cygwin/ =~ RUBY_PLATFORM # for cygwin 1.1.5
+have_header("netinet/tcp.h") if /cygwin/ !~ RUBY_PLATFORM # for cygwin 1.1.5
have_header("netinet/udp.h")
if have_func("sendmsg") | have_func("recvmsg")