summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-04-16 06:12:49 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-04-16 06:12:49 +0000
commit5fb3c416142c9fea8a212381b5332fb274e506d7 (patch)
treef89477d1af53490c22feb396f50eeb8658f84914
parentbcab5ca9d1b50cc940d3c2cf190c6ef18a20f3d0 (diff)
alpha
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--util.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1aa0dd4..0202af0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 16 15:09:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * util.c (mmprepare): int is too small to cast from pointers.
+
+ * config.guess: avoid 'linux-gnu' for alpha-unknown-linux.
+
Thu Apr 15 23:46:20 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ruby.c (rubylib_mangle): mangle path by RUBYLIB_PREFIX.
diff --git a/util.c b/util.c
index df3837b..bdd68ed 100644
--- a/util.c
+++ b/util.c
@@ -572,10 +572,10 @@ static void mmprepare(base, size) void *base; int size;
if (size <= 0) die("mmsize <= 0");
#endif
- if ( ((int)base & (4-1)) == 0 && (size & (4-1)) == 0 )
- if (size >= 16) mmkind = 1;
- else mmkind = 0;
- else mmkind = -1;
+ if (((long)base & (4-1)) == 0 && (long & (4-1)) == 0)
+ if (size >= 16) mmkind = 1;
+ else mmkind = 0;
+ else mmkind = -1;
mmsize = size;
high = (size & (-16));
@@ -594,7 +594,7 @@ static void mmswap(a, b) register char *a, *b;
s = A[1]; A[1] = B[1]; B[1] = s;
s = A[2]; A[2] = B[2]; B[2] = s;
s = A[3]; A[3] = B[3]; B[3] = s; a += 16; b += 16;
- }while (a < t);
+ } while (a < t);
}
if (low != 0) { s = A[0]; A[0] = B[0]; B[0] = s;
if (low >= 8) { s = A[1]; A[1] = B[1]; B[1] = s;