diff options
| author | Alon Levy <alevy@redhat.com> | 2010-12-06 14:00:10 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2010-12-08 17:11:45 +0200 |
| commit | af1bfa625063fef5d417d798432df3f73a4949e6 (patch) | |
| tree | 23c9b37886f139df2a4b44670f80ea9d4bba43e3 | |
| parent | f6cacd0e51d345e1ee8b82e420c59dfaaf95300a (diff) | |
| download | spice-af1bfa625063fef5d417d798432df3f73a4949e6.tar.gz spice-af1bfa625063fef5d417d798432df3f73a4949e6.tar.xz spice-af1bfa625063fef5d417d798432df3f73a4949e6.zip | |
mingw32 build: fix various warnings
| -rw-r--r-- | client/windows/event_sources_p.cpp | 2 | ||||
| -rw-r--r-- | client/windows/main.cpp | 10 | ||||
| -rw-r--r-- | client/windows/red_window_p.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/client/windows/event_sources_p.cpp b/client/windows/event_sources_p.cpp index 393ea76a..c3578572 100644 --- a/client/windows/event_sources_p.cpp +++ b/client/windows/event_sources_p.cpp @@ -88,7 +88,7 @@ bool EventSources::wait_events(int timeout_ms) THROW("wait failed %d", GetLastError()); } - int event_index = wait_res - WAIT_OBJECT_0; + size_t event_index = wait_res - WAIT_OBJECT_0; if (event_index == _handles.size()) { return process_system_events(); } else if ((event_index >= 0) && (event_index < (int)_handles.size())) { diff --git a/client/windows/main.cpp b/client/windows/main.cpp index a85acec9..9c401023 100644 --- a/client/windows/main.cpp +++ b/client/windows/main.cpp @@ -38,7 +38,7 @@ static void init_winsock() } } -char* version_string = "???"; +const char* version_string = "???"; static char _version_string[40]; static void init_version_string() @@ -59,10 +59,10 @@ static void init_version_string() return; } sprintf(_version_string, "%d.%d.%d.%d", - file_info->dwFileVersionMS >> 16, - file_info->dwFileVersionMS & 0x0ffff, - file_info->dwFileVersionLS >> 16, - file_info->dwFileVersionLS & 0x0ffff); + (int)(file_info->dwFileVersionMS >> 16), + (int)(file_info->dwFileVersionMS & 0x0ffff), + (int)(file_info->dwFileVersionLS >> 16), + (int)(file_info->dwFileVersionLS & 0x0ffff)); version_string = _version_string; } diff --git a/client/windows/red_window_p.h b/client/windows/red_window_p.h index 38426c7a..351d9b96 100644 --- a/client/windows/red_window_p.h +++ b/client/windows/red_window_p.h @@ -29,7 +29,7 @@ typedef HWND Window; class CommandInfo { public: - CommandInfo() : menu (0), command (NULL) {} + CommandInfo() : menu (0), command (0) {} CommandInfo(Menu* in_menu, int in_command) : menu (in_menu), command (in_command) {} Menu* menu; |