From befe282d0054d07a2f27a35c9f1f4c0ec1396218 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 20 Jan 1998 04:16:43 +0000
Subject: *** empty log message ***

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@30 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 7 +++++++
 ext/extmk.rb.in | 2 +-
 instruby.rb     | 1 +
 re.c            | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c014815b2d..d5d9e72ed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/re.c b/re.c
index 2f1a9211e0..83fb94afb1 100644
--- a/re.c
+++ b/re.c
@@ -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++) {
-- 
cgit v1.2.3