summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-13 05:35:27 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-13 05:35:27 +0000
commitc0a51f4e8b45f8e8a25e02f533993c556a216f1d (patch)
tree1c3eca527b62eeb9fb42b34633e0743723bc9f73
parent557918ea13dfb8d459001e91173d05468419d9d5 (diff)
downloadruby-c0a51f4e8b45f8e8a25e02f533993c556a216f1d.tar.gz
ruby-c0a51f4e8b45f8e8a25e02f533993c556a216f1d.tar.xz
ruby-c0a51f4e8b45f8e8a25e02f533993c556a216f1d.zip
* string.c, missing.h: failed to build on powerpc-apple-darwin7.9.0
because of crypt argument's constness mismatch. (I hope this works) (http://mput.dip.jp/autobuild/ruby-trunk/log/20050913T110001.gz) git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--missing.h2
-rw-r--r--string.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c3d472f73..9719292bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 13 14:27:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * string.c, missing.h: failed to build on powerpc-apple-darwin7.9.0
+ because of crypt argument's constness mismatch. (I hope this works)
+ (http://mput.dip.jp/autobuild/ruby-trunk/log/20050913T110001.gz)
+
Tue Sep 13 12:33:05 2005 <why@ruby-lang.org>
* lib/yaml.rb: reworking YAML::Stream to use the new
diff --git a/missing.h b/missing.h
index a4616950e..cb4f12a12 100644
--- a/missing.h
+++ b/missing.h
@@ -32,7 +32,7 @@ extern double atanh _((double));
#endif
#ifndef HAVE_CRYPT
-extern char *crypt _((char *, char *));
+extern char *crypt _((const char *, const char *));
#endif
#ifndef HAVE_DUP2
diff --git a/string.c b/string.c
index fe27fd4c2..750e920bb 100644
--- a/string.c
+++ b/string.c
@@ -4141,7 +4141,7 @@ rb_str_oct(VALUE str)
static VALUE
rb_str_crypt(VALUE str, VALUE salt)
{
- extern char *crypt(char *, char *);
+ extern char *crypt(const char *, const char *);
VALUE result;
char *s;