summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-16 14:58:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-16 14:58:34 +0000
commit8695612caf8afe1138a7baaa142658dd93c70293 (patch)
treec6d71782b58b573eb26d942682b84acc0a33561c /marshal.c
parent32df87feabb8b2b99fc47e64896b2c922dca6451 (diff)
* marshal.c (w_symbol, w_object): get rid of warnings.
* re.c (rb_memsearch): ditto. * time.c (time_dump): ditto. * ext/extmk.rb (extmake): not continue making when extconf.rb failed. * ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely. * ext/openssl/ossl.h: remove version.h dependency. * ext/openssl/ruby_missing.h: ditto. * lib/mkmf.rb (pkg_config): use --libs output except with only-L for other options. [ruby-list:38099] * lib/mkmf.rb (create_makefile): separate rule for static library from shared object. * win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub: define exec_prefix and libdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/marshal.c b/marshal.c
index e4f8445..cf947e4 100644
--- a/marshal.c
+++ b/marshal.c
@@ -308,11 +308,11 @@ w_symbol(id, arg)
struct dump_arg *arg;
{
char *sym = rb_id2name(id);
- long num;
+ st_data_t num;
if (st_lookup(arg->symbols, id, &num)) {
w_byte(TYPE_SYMLINK, arg);
- w_long(num, arg);
+ w_long((long)num, arg);
}
else {
w_byte(TYPE_SYMBOL, arg);
@@ -468,11 +468,11 @@ w_object(obj, arg, limit)
w_symbol(SYM2ID(obj), arg);
}
else {
- long num;
+ st_data_t num;
if (st_lookup(arg->data, obj, &num)) {
w_byte(TYPE_LINK, arg);
- w_long(num, arg);
+ w_long((long)num, arg);
return;
}