Revision: 3932 http://trac.macosforge.org/projects/ruby/changeset/3932 Author: lsansonetti@apple.com Date: 2010-04-14 13:01:45 -0700 (Wed, 14 Apr 2010) Log Message: ----------- revert r3931 Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/3931 Modified Paths: -------------- MacRuby/trunk/ext/json/extconf.rb MacRuby/trunk/ext/ripper/extconf.rb MacRuby/trunk/rakelib/builder/options.rb MacRuby/trunk/rakelib/builder.rake Modified: MacRuby/trunk/ext/json/extconf.rb =================================================================== --- MacRuby/trunk/ext/json/extconf.rb 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/ext/json/extconf.rb 2010-04-14 20:01:45 UTC (rev 3932) @@ -3,6 +3,6 @@ require 'rbconfig' $INCFLAGS << ' -I../..' -$CFLAGS << ' -Wall -std=gnu99' +$CFLAGS << ' -Wall -std=c99' create_makefile("json") Modified: MacRuby/trunk/ext/ripper/extconf.rb =================================================================== --- MacRuby/trunk/ext/ripper/extconf.rb 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/ext/ripper/extconf.rb 2010-04-14 20:01:45 UTC (rev 3932) @@ -17,7 +17,7 @@ $VPATH << '$(topdir)' << '$(top_srcdir)' $INCFLAGS << ' -I$(topdir) -I$(top_srcdir) -I$(top_srcdir)/onig' $INCFLAGS << ' -I../../icu-1060' if `sw_vers -productVersion`.to_f <= 10.6 - $CFLAGS << ' -std=gnu99' + $CFLAGS << ' -std=c99' create_makefile 'ripper' end Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/rakelib/builder/options.rb 2010-04-14 20:01:45 UTC (rev 3932) @@ -115,8 +115,8 @@ LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lauto -licucore -framework Foundation" DLDFLAGS = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION}" DLDFLAGS << " -unexported_symbols_list #{UNEXPORTED_SYMBOLS_LIST}" if UNEXPORTED_SYMBOLS_LIST -CFLAGS << " -std=gnu99" # we add this one later to not conflict with C++ flags -OBJC_CFLAGS << " -std=gnu99" +CFLAGS << " -std=c99" # we add this one later to not conflict with C++ flags +OBJC_CFLAGS << " -std=c99" if `sw_vers -productVersion`.to_f <= 10.6 CFLAGS << " -I./icu-1060" Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/rakelib/builder.rake 2010-04-14 20:01:45 UTC (rev 3932) @@ -3,7 +3,7 @@ desc "Build the markgc tool" task :mark_gc do if !File.exist?('markgc') - sh "/usr/bin/gcc -std=gnu99 markgc.c -o markgc -Wno-format" + sh "/usr/bin/gcc -std=c99 markgc.c -o markgc -Wno-format" end end