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 /ui/qt/main_window.cpp | |
| parent | c4fbede67ae514607d4a636e567eb3d21f15410e (diff) | |
| download | wireshark-4e60e8fb390005db6c69e9b79fa9a01140fa0e44.tar.gz | |
[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 '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 8be1b58a92..3deb284bab 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, int *child_process, pipe_input_cb_t input_cb) +void pipe_input_set_handler(gint source, gpointer user_data, intptr_t *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, int *child_process, pipe_input_cb_t input_cb) +void MainWindow::setPipeInputHandler(gint source, gpointer user_data, intptr_t *child_process, pipe_input_cb_t input_cb) { pipe_source_ = source; pipe_child_process_ = child_process; |