diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/date.rb | 1 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 | ||||
| -rw-r--r-- | lib/singleton.rb | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/date.rb b/lib/date.rb index 4abf75f431..58179a7153 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -202,6 +202,7 @@ class Date for id in ids module_eval <<-"end;" alias_method :__#{id.to_i}__, :#{id.id2name} + private :__#{id.to_i}__ def #{id.id2name}(*args, &block) (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0] end diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 788a957792..317200ba79 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -44,7 +44,7 @@ else end LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}" -CPP = "#{CONFIG['CPP']} -E -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c" +CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c" def rm_f(*files) targets = [] @@ -104,7 +104,7 @@ def try_cpp(src, opt="") cfile.print src cfile.close begin - xsystem(format(CPP, $CFLAGS, opt)) + xsystem(format(CPP, $CPPFLAGS, $CFLAGS, opt)) ensure rm_f "conftest*" end @@ -115,7 +115,7 @@ def egrep_cpp(pat, src, opt="") cfile.print src cfile.close begin - xsystem(format(CPP+"|egrep #{pat}", $CFLAGS, opt)) + xsystem(format(CPP+"|egrep #{pat}", $CPPFLAGS, $CFLAGS, opt)) ensure rm_f "conftest*" end diff --git a/lib/singleton.rb b/lib/singleton.rb index 235ba898fd..aa245b32b2 100644 --- a/lib/singleton.rb +++ b/lib/singleton.rb @@ -16,10 +16,10 @@ module Singleton klass.instance_eval %{ @__instance__ = nil def instance - Thread.critical = true unless @__instance__ + Thread.critical = true begin - @__instance__ = new + @__instance__ ||= new ensure Thread.critical = false end |