ruby-changes:21785
From: kosaki <ko1@a...>
Date: Fri, 25 Nov 2011 08:02:54 +0900 (JST)
Subject: [ruby-changes:21785] kosaki:r33834 (trunk): * lib/mkmf.rb: get rid of warnings of mkmf.rb if -Wmissing-declarations
kosaki 2011-11-25 08:02:44 +0900 (Fri, 25 Nov 2011) New Revision: 33834 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33834 Log: * lib/mkmf.rb: get rid of warnings of mkmf.rb if -Wmissing-declarations and/or -Wold-style-definition warnings if specified. Patch by Nikolai Weibull. Thank you! [Bug #5459] [ruby-core:40200] Modified files: trunk/ChangeLog trunk/lib/mkmf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 33833) +++ ChangeLog (revision 33834) @@ -1,3 +1,9 @@ +Fri Nov 25 08:00:23 2011 KOSAKI Motohiro <kosaki.motohiro@g...> + + * lib/mkmf.rb: get rid of warnings of mkmf.rb if -Wmissing-declarations + and/or -Wold-style-definition warnings if specified. + Patch by Nikolai Weibull. Thank you! [Bug #5459] [ruby-core:40200] + Fri Nov 25 07:56:49 2011 KOSAKI Motohiro <kosaki.motohiro@g...> * configure.in: remove [read buffer ptr field in FILE structures] check. Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 33833) +++ lib/mkmf.rb (revision 33834) @@ -643,13 +643,15 @@ #{headers} /*top*/ #{MAIN_DOES_NOTHING} -int t() { #{decltype["volatile p"]}; p = (#{decltype[]})#{func}; return 0; } +extern int t(void); +int t(void) { #{decltype["volatile p"]}; p = (#{decltype[]})#{func}; return 0; } SRC call && try_link(<<"SRC", opt, &b) #{headers} /*top*/ #{MAIN_DOES_NOTHING} -int t() { #{call}; return 0; } +extern int t(void); +int t(void) { #{func}(); return 0; } SRC end @@ -660,7 +662,8 @@ #{headers} /*top*/ #{MAIN_DOES_NOTHING} -int t() { const volatile void *volatile p; p = &(&#{var})[0]; return 0; } +extern int t(void); +int t(void) { const volatile void *volatile p; p = &(&#{var})[0]; return 0; } SRC end @@ -1276,7 +1279,8 @@ /*top*/ volatile #{type} conftestval; #{MAIN_DOES_NOTHING} -int t() {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));} +extern int t(void); +int t(void) {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));} SRC end @@ -1288,7 +1292,8 @@ /*top*/ volatile #{type} conftestval; #{MAIN_DOES_NOTHING} -int t() {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));} +extern int t(void); +int t(void) {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));} SRC end @@ -2308,7 +2313,7 @@ LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"' RPATHFLAG = config_string('RPATHFLAG') || '' LIBARG = config_string('LIBARG') || '-l%s' -MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main() {return 0;}' +MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main(void) {return 0;}' UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)} || %w[int short long long\ long] -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/