diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 2 | ||||
| -rw-r--r-- | instruby.rb | 1 | ||||
| -rw-r--r-- | re.c | 4 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Tue Jan 19 18:19:24 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * ext/extmk.rb.in (install): there should be no newline after install: + + * re.c (MIN): renamed from min(). there's a local variable named + min in the file, so that some cpp will raise an error. + Mon Jan 19 16:30:05 1998 Yukihiro Matsumoto <matz@netlab.co.jp> * version 1.1b5 released. diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index e1d318d19c..066e744944 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -276,7 +276,7 @@ realclean: clean install: " if !$static - mfile.printf " + mfile.printf "\ @test -d $(libdir) || mkdir $(libdir) $(INSTALL) $(TARGET) $(libdir)/$(TARGET) " diff --git a/instruby.rb b/instruby.rb index 8fd77055f2..3d3f2a4173 100644 --- a/instruby.rb +++ b/instruby.rb @@ -33,5 +33,6 @@ IO.foreach 'MANIFEST' do |$_| File.install "config.h", archdir, 0644, TRUE end File.install "rbconfig.rb", archdir, 0644, TRUE +File.makedirs mandir, TRUE File.install "ruby.1", mandir, 0644, TRUE # vi:set sw=2: @@ -69,7 +69,7 @@ static char casetable[] = { >>> "You lose. You will need a translation table for your character set." <<< #endif -#define min(a,b) (((a)>(b))?(b):(a)) +#define MIN(a,b) (((a)>(b))?(b):(a)) int str_cicmp(str1, str2) @@ -78,7 +78,7 @@ str_cicmp(str1, str2) int len, i; char *p1, *p2; - len = min(RSTRING(str1)->len, RSTRING(str2)->len); + len = MIN(RSTRING(str1)->len, RSTRING(str2)->len); p1 = RSTRING(str1)->ptr; p2 = RSTRING(str2)->ptr; for (i = 0; i < len; i++, p1++, p2++) { |