diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-09 17:30:15 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-10 00:30:57 +0000 |
| commit | 2e76bb466a82110ca80d5d6d982842cf2f9cc964 (patch) | |
| tree | 25e32f1b8f1dc338d06aa090270827ceca8789ac /capchild/capture_session.h | |
| parent | 3944e5563365cdd51a3a6ca3d55cff88d3bd4a25 (diff) | |
| download | wireshark-2e76bb466a82110ca80d5d6d982842cf2f9cc964.tar.gz | |
Use pid_t on UN*X, and HANDLE on Windows, for the process ID.
This avoids type punning; at least with Xcode 7 beta on El Capitan beta,
that produces warnings that get turned into errors.
Change-Id: I57f47455b9630f359828c07c92a190b5cb33816f
Reviewed-on: https://code.wireshark.org/review/8862
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capchild/capture_session.h')
| -rw-r--r-- | capchild/capture_session.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/capchild/capture_session.h b/capchild/capture_session.h index e21d182fe3..4f0de81b01 100644 --- a/capchild/capture_session.h +++ b/capchild/capture_session.h @@ -34,6 +34,8 @@ extern "C" { #include "capture_opts.h" +#include <wsutil/process.h> + #ifdef HAVE_LIBPCAP /* Current state of capture engine. XXX - differentiate states */ typedef enum { @@ -48,14 +50,14 @@ struct _capture_file; * State of a capture session. */ typedef struct _capture_session { - intptr_t fork_child; /**< If not -1, in parent, process ID of child */ + ws_process_id 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 */ #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 */ + uid_t owner; /**< owner of the cfile */ gid_t group; /**< group of the cfile */ #endif gboolean session_started; |