1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mkmf.rb: suppress warnings

Browse Source 
* lib/mkmf.rb (check_sizeof, what_type): remove static qualifiers
  to suppress unneeded-internal-declaration warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-06-29 03:43:21 +00:00
parent 96c1e6ac2b
commit 6cb284a2cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mkmf.rb
View File

@ -1326,7 +1326,7 @@ SRC
# #
def check_sizeof(type, headers = nil, opts = "", &b) def check_sizeof(type, headers = nil, opts = "", &b)
typedef, member, prelude = typedef_expr(type, headers) typedef, member, prelude = typedef_expr(type, headers)
prelude << "static #{typedef} *rbcv_ptr_;\n" prelude << "#{typedef} *rbcv_ptr_;\n"
prelude = [prelude] prelude = [prelude]
expr = "sizeof((*rbcv_ptr_)#{"." << member if member})" expr = "sizeof((*rbcv_ptr_)#{"." << member if member})"
fmt = STRING_OR_FAILED_FORMAT fmt = STRING_OR_FAILED_FORMAT
@ -1479,7 +1479,7 @@ SRC
prelude = [cpp_include(headers).split(/^/)] prelude = [cpp_include(headers).split(/^/)]
prelude << ["typedef #{type} rbcv_typedef_;\n", prelude << ["typedef #{type} rbcv_typedef_;\n",
"extern rbcv_typedef_ *#{func};\n", "extern rbcv_typedef_ *#{func};\n",
"static rbcv_typedef_ #{var};\n", "rbcv_typedef_ #{var};\n",
] ]
type = "rbcv_typedef_" type = "rbcv_typedef_"
fmt = member && !(typeof = have_typeof?) ? "seems %s" : "%s" fmt = member && !(typeof = have_typeof?) ? "seems %s" : "%s"
@ -1490,7 +1490,7 @@ SRC
type = "rbcv_mem_typedef_" type = "rbcv_mem_typedef_"
prelude[-1] << "typedef #{typeof}(#{val}) #{type};\n" prelude[-1] << "typedef #{typeof}(#{val}) #{type};\n"
prelude[-1] << "extern #{type} *#{func};\n" prelude[-1] << "extern #{type} *#{func};\n"
prelude[-1] << "static #{type} #{var};\n" prelude[-1] << "#{type} #{var};\n"
val = var val = var
end end
def fmt.%(x) def fmt.%(x)
@ -1513,7 +1513,7 @@ SRC
type = UNIVERSAL_INTS.find do |t| type = UNIVERSAL_INTS.find do |t|
pre = prelude pre = prelude
unless member unless member
pre += [["static #{unsigned} #{t} #{ptr}#{var};\n", pre += [["#{unsigned} #{t} #{ptr}#{var};\n",
"extern #{unsigned} #{t} #{ptr}*#{func};\n"]] "extern #{unsigned} #{t} #{ptr}*#{func};\n"]]
end end
try_static_assert("sizeof(#{ptr}#{val}) == sizeof(#{unsigned} #{t})", pre) try_static_assert("sizeof(#{ptr}#{val}) == sizeof(#{unsigned} #{t})", pre)