diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi.rb | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 7f40c3a0f6..1b55f0ac95 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -939,7 +939,7 @@ convert string charset, and set language to "ja". start_pos = lines.rindex(/^\s*<#{element}/ni, end_pos) lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/n, "\n" + shift) + "__" end - lines.gsub(/^(\s*)__(?=<\/?\w)/n, '\1') + lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/n, '\1') end diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0d67687638..41ffe4c726 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -386,7 +386,7 @@ hdrdir = #{$hdrdir} CC = #{CONFIG["CC"]} CFLAGS = #{CONFIG["CCDLFLAGS"]} #{CFLAGS} #{$CFLAGS} -CPPFLAGS = -I$(hdrdir) -I#{CONFIG["includedir"]} #{$defs.join(" ")} + CPPFLAGS = -I$(hdrdir) -I#{CONFIG["includedir"]} #{$defs.join(" ")} #{CONFIG["CPPFLAGS"]} CXXFLAGS = $(CFLAGS) DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS} LDSHARED = #{CONFIG["LDSHARED"]} #{defflag} @@ -455,6 +455,11 @@ EOMF $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< " + else + mfile.print " +.c.#{$OBJEXT}: + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< +" end if CONFIG["DLEXT"] != $OBJEXT |