diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Win32API/Win32API.c | 2 | ||||
| -rw-r--r-- | ext/dl/ptr.c | 5 | ||||
| -rw-r--r-- | ext/dl/sym.c | 2 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 5 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 4 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 17 |
6 files changed, 19 insertions, 16 deletions
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c index 96ce8c6636..a4fd0396f0 100644 --- a/ext/Win32API/Win32API.c +++ b/ext/Win32API/Win32API.c @@ -108,7 +108,7 @@ Win32API_initialize(self, dllname, proc, import, export) } if (16 < RARRAY(a_import)->len) { - rb_raise(rb_eRuntimeError, "too many parameters: %d\n", RARRAY(a_import)->len); + rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len); } rb_iv_set(self, "__import__", a_import); diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c index 4d75a3ddf2..5112151733 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); diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index 4c9c8f03c4..66f7e8818a 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -35,6 +35,7 @@ */ #include "config.h" +#include <stdio.h> #include <sys/types.h> #ifndef _WIN32 #if defined(__BEOS__) @@ -51,15 +52,11 @@ #endif #include <netdb.h> #if defined(HAVE_RESOLV_H) -#ifdef _SX -#include <stdio.h> -#endif #include <resolv.h> #endif #endif #ifdef _WIN32 #include <winsock2.h> -#include <stdio.h> #define snprintf _snprintf #endif diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 10b79f2970..bad72b4f7f 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4414,13 +4414,13 @@ ip_finalize(ip) } if (Tcl_InterpDeleted(ip)) { - DUMP2("ip(%lx) is already deleted", ip); + DUMP2("ip(%p) is already deleted", ip); return; } #if TCL_NAMESPACE_DEBUG if (ip_null_namespace(ip)) { - DUMP2("ip(%lx) has null namespace", ip); + DUMP2("ip(%p) has null namespace", ip); return; } #endif diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 950ff21fd9..dace9df806 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -497,7 +497,7 @@ ole_hresult2msg(hr) DWORD dwCount; char strhr[100]; - sprintf(strhr, " HRESULT error code:0x%08x\n ", hr); + sprintf(strhr, " HRESULT error code:0x%08lx\n ", hr); msg = rb_str_new2(strhr); dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | @@ -4033,7 +4033,8 @@ folevariable_name(self) return rb_ivar_get(self, rb_intern("name")); } -static ole_variable_ole_type(pTypeInfo, var_index) +static VALUE +ole_variable_ole_type(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4077,7 +4078,8 @@ folevariable_ole_type(self) return ole_variable_ole_type(pvar->pTypeInfo, pvar->index); } -static ole_variable_ole_type_detail(pTypeInfo, var_index) +static VALUE +ole_variable_ole_type_detail(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4113,7 +4115,8 @@ folevariable_ole_type_detail(self) return ole_variable_ole_type_detail(pvar->pTypeInfo, pvar->index); } -static ole_variable_value(pTypeInfo, var_index) +static VALUE +ole_variable_value(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4159,7 +4162,8 @@ folevariable_value(self) return ole_variable_value(pvar->pTypeInfo, pvar->index); } -static ole_variable_visible(pTypeInfo, var_index) +static VALUE +ole_variable_visible(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4631,7 +4635,8 @@ folemethod_visible(self) return ole_method_visible(pmethod->pTypeInfo, pmethod->index); } -static ole_method_event(pTypeInfo, method_index, method_name) +static VALUE +ole_method_event(pTypeInfo, method_index, method_name) ITypeInfo *pTypeInfo; WORD method_index; VALUE method_name; |