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 /ui/gtk/gui_utils.c | |
| 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 'ui/gtk/gui_utils.c')
| -rw-r--r-- | ui/gtk/gui_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 761e1d8034..1e4ad67f09 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -580,7 +580,7 @@ main_window_quit(void) typedef struct pipe_input_tag { gint source; gpointer user_data; - intptr_t *child_process; + ws_process_id *child_process; pipe_input_cb_t input_cb; guint pipe_input_id; #ifdef _WIN32 @@ -693,7 +693,7 @@ pipe_input_cb(GIOChannel *source _U_, void pipe_input_set_handler(gint source, gpointer user_data, - intptr_t *child_process, + ws_process_id *child_process, pipe_input_cb_t input_cb) { static pipe_input_t pipe_input; |