diff options
| author | Anders <anders.broman@ericsson.com> | 2015-06-09 10:13:29 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-09 14:13:14 +0000 |
| commit | 4e60e8fb390005db6c69e9b79fa9a01140fa0e44 (patch) | |
| tree | bdfa0b498ab74f7cce496fa027a0bd024404ee69 /capchild/capture_session.h | |
| parent | c4fbede67ae514607d4a636e567eb3d21f15410e (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 'capchild/capture_session.h')
| -rw-r--r-- | capchild/capture_session.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/capchild/capture_session.h b/capchild/capture_session.h index 5f3d46d842..e21d182fe3 100644 --- a/capchild/capture_session.h +++ b/capchild/capture_session.h @@ -29,6 +29,7 @@ extern "C" { #ifndef _WIN32 #include <sys/types.h> +#include <stdint.h> #endif #include "capture_opts.h" @@ -47,20 +48,20 @@ struct _capture_file; * State of a capture session. */ typedef struct _capture_session { - int fork_child; /**< If not -1, in parent, process ID of child */ - int fork_child_status; /**< Child exit status */ + intptr_t fork_child; /**< If not -1, in parent, process ID of child */ + int fork_child_status; /**< Child exit status */ #ifdef _WIN32 - int signal_pipe_write_fd; /**< the pipe to signal the child */ + int signal_pipe_write_fd; /**< the pipe to signal the child */ #endif - capture_state state; /**< current state of the capture engine */ + capture_state state; /**< current state of the capture engine */ #ifndef _WIN32 - uid_t owner; /**< owner of the cfile */ - gid_t group; /**< group of the cfile */ + uid_t owner; /**< owner of the cfile */ + gid_t group; /**< group of the cfile */ #endif - gboolean session_started; - guint32 count; /**< Total number of frames captured */ - capture_options *capture_opts; /**< options for this capture */ - struct _capture_file *cf; /**< handle to cfile */ + gboolean session_started; + guint32 count; /**< Total number of frames captured */ + capture_options *capture_opts; /**< options for this capture */ + struct _capture_file *cf; /**< handle to cfile */ } capture_session; extern void |