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/qt/main_window.cpp | |
| 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/qt/main_window.cpp')
| -rw-r--r-- | ui/qt/main_window.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 3deb284bab..52af27a336 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -77,7 +77,7 @@ // If we ever add support for multiple windows this will need to be replaced. static MainWindow *gbl_cur_main_window_ = NULL; -void pipe_input_set_handler(gint source, gpointer user_data, intptr_t *child_process, pipe_input_cb_t input_cb) +void pipe_input_set_handler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb) { gbl_cur_main_window_->setPipeInputHandler(source, user_data, child_process, input_cb); } @@ -472,7 +472,7 @@ QString MainWindow::getFilter() return df_combo_box_->itemText(df_combo_box_->count()); } -void MainWindow::setPipeInputHandler(gint source, gpointer user_data, intptr_t *child_process, pipe_input_cb_t input_cb) +void MainWindow::setPipeInputHandler(gint source, gpointer user_data, ws_process_id *child_process, pipe_input_cb_t input_cb) { pipe_source_ = source; pipe_child_process_ = child_process; |