aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorAnders <anders.broman@ericsson.com>2015-06-09 10:13:29 +0200
committerAnders Broman <a.broman58@gmail.com>2015-06-09 14:13:14 +0000
commit4e60e8fb390005db6c69e9b79fa9a01140fa0e44 (patch)
treebdfa0b498ab74f7cce496fa027a0bd024404ee69 /tshark.c
parentc4fbede67ae514607d4a636e567eb3d21f15410e (diff)
[MSVC 2015] Use intptr_t for "pointer stored as int" to make MSVC happy.
Change-Id: I5dbbea8527a8bb73b17e5a8a5611c3923d82459c Reviewed-on: https://code.wireshark.org/review/8852 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>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tshark.c b/tshark.c
index 445d6ce624..7b474a8920 100644
--- a/tshark.c
+++ b/tshark.c
@@ -2278,7 +2278,7 @@ DIAG_ON(cast-qual)
typedef struct pipe_input_tag {
gint source;
gpointer user_data;
- int *child_process;
+ intptr_t *child_process;
pipe_input_cb_t input_cb;
guint pipe_input_id;
#ifdef _WIN32
@@ -2351,7 +2351,7 @@ pipe_timer_cb(gpointer data)
void
-pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb)
+pipe_input_set_handler(gint source, gpointer user_data, intptr_t *child_process, pipe_input_cb_t input_cb)
{
pipe_input.source = source;