diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-06-09 17:03:13 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-10 08:01:37 +0000 |
| commit | 3f64384e364c4501f8d12fc39dca9545b7a23fa0 (patch) | |
| tree | fa6bd73b5f429a4228a5355be103509f2421a345 | |
| parent | 6f675b56398a08f2dc674e29a34f872bce97a840 (diff) | |
| download | wireshark-3f64384e364c4501f8d12fc39dca9545b7a23fa0.tar.gz | |
[MSVC 2015] Use intptr_t to make MSVC happy.
Change-Id: I1a39495bc2a752070db8c62136b17d9567bc33ab
Reviewed-on: https://code.wireshark.org/review/8856
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | rawshark.c | 2 | ||||
| -rw-r--r-- | ui/gtk/webbrowser.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rawshark.c b/rawshark.c index 52cc79f022..1561b8ac45 100644 --- a/rawshark.c +++ b/rawshark.c @@ -336,7 +336,7 @@ raw_pipe_open(const char *pipe_name) } } - rfd = _open_osfhandle((long) hPipe, _O_RDONLY); + rfd = _open_osfhandle((intptr_t) hPipe, _O_RDONLY); if (rfd == -1) { fprintf(stderr, "rawshark: \"%s\" could not be opened: %s\n", pipe_name, g_strerror(errno)); diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index c8c4940cc2..67457e44ee 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -155,7 +155,7 @@ browser_open_url (const gchar *url) { #if defined(G_OS_WIN32) - return ((gint) ShellExecute (HWND_DESKTOP, _T("open"), utf_8to16(url), NULL, NULL, SW_SHOWNORMAL) > 32); + return ((intptr_t) ShellExecute (HWND_DESKTOP, _T("open"), utf_8to16(url), NULL, NULL, SW_SHOWNORMAL) > 32); #elif defined(HAVE_OS_X_FRAMEWORKS) @@ -312,12 +312,12 @@ filemanager_open_directory (const gchar *path) (eg: wireshak-gtk2.exe exists in the same directory as a wireshark-gtk2 directory entry). */ - gint ret; - gchar *xpath; + intptr_t ret; + gchar *xpath; xpath = g_strconcat(path, g_str_has_suffix(path, "\\") ? "" : "\\", NULL); - ret = (gint) ShellExecute (HWND_DESKTOP, _T("explore"), utf_8to16(xpath), NULL, NULL, SW_SHOWNORMAL); + ret = (intptr_t) ShellExecute (HWND_DESKTOP, _T("explore"), utf_8to16(xpath), NULL, NULL, SW_SHOWNORMAL); g_free(xpath); return (ret > 32); |