diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-22 05:33:47 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-22 05:33:47 +0000 |
| commit | 60e3b1b4416117cfc629949c45510012ca3eb432 (patch) | |
| tree | c46f844b311a0f82354e59129b43d6c2ac0563fa /ext/dl | |
| parent | 22cbdad1d40db1f72574ea2e0ab573017a18314f (diff) | |
* file.c (rb_file_s_rename): deleted code to get rid of a bug of
old Cygwin.
* file.c (rb_file_truncate): added prototype of GetLastError()
on cygwin. [ruby-dev:31239]
* intern.h (is_ruby_native_thread): prototype.
* missing/strftime.c (strftime): fix printf format and actual
arguments.
* ext/Win32API/Win32API.c (Win32API_initialize): ditto.
* ext/tk/tcltklib.c (ip_finalize): ditto.
* ext/dl/ptr.c (rb_dlptr_inspect): ditto. [ruby-dev:31268]
* ext/dl/sym.c (rb_dlsym_inspect): ditto.
* ext/socket/getnameinfo.c: include stdio.h always.
* ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name,
folevariable_ole_type, folevariable_ole_type_detail,
folevariable_value, folemethod_visible): missing return value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl')
| -rw-r--r-- | ext/dl/ptr.c | 5 | ||||
| -rw-r--r-- | ext/dl/sym.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c index f54df8b34b..b083236cac 100644 --- a/ext/dl/ptr.c +++ b/ext/dl/ptr.c @@ -466,8 +466,9 @@ rb_dlptr_inspect(VALUE self) char str[1024]; Data_Get_Struct(self, struct ptr_data, data); - snprintf(str, 1023, "#<%s:0x%x ptr=0x%x size=%ld free=0x%x>", - rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free); + snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>", + rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, + (long)data->free); return rb_str_new2(str); } diff --git a/ext/dl/sym.c b/ext/dl/sym.c index 87d07e7cbe..01e0474f58 100644 --- a/ext/dl/sym.c +++ b/ext/dl/sym.c @@ -268,7 +268,7 @@ rb_dlsym_inspect(VALUE self) str_size = RSTRING(proto)->len + 100; str = dlmalloc(str_size); snprintf(str, str_size - 1, - "#<DL::Symbol:0x%x func=0x%x '%s'>", + "#<DL::Symbol:0x%lx func=0x%lx '%s'>", sym, sym->func, RSTRING(proto)->ptr); val = rb_tainted_str_new2(str); dlfree(str); |