diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/capture.c | 5 | ||||
| -rw-r--r-- | ui/gtk/gui_utils.c | 4 | ||||
| -rw-r--r-- | ui/qt/main_window.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/main_window.h | 4 | ||||
| -rw-r--r-- | ui/ui_util.h | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/ui/capture.c b/ui/capture.c index 8542240610..18c3040edb 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -63,7 +63,7 @@ typedef struct if_stat_cache_item_s { struct if_stat_cache_s { int stat_fd; - int fork_child; + intptr_t fork_child; GList *cache_list; /* List of if_stat_chache_entry_t */ }; @@ -644,7 +644,8 @@ capture_input_closed(capture_session *cap_session, gchar *msg) if_stat_cache_t * capture_stat_start(capture_options *capture_opts) { - int stat_fd, fork_child; + int stat_fd; + intptr_t fork_child; gchar *msg; if_stat_cache_t *sc = NULL; if_stat_cache_item_t *sc_item; diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index e0b2a1f9e2..761e1d8034 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; - int *child_process; + intptr_t *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, - int *child_process, + intptr_t *child_process, pipe_input_cb_t input_cb) { static pipe_input_t pipe_input; 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; diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index a93394a447..172244e703 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -78,7 +78,7 @@ class MainWindow : public QMainWindow public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); - void setPipeInputHandler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb); + void setPipeInputHandler(gint source, gpointer user_data, intptr_t *child_process, pipe_input_cb_t input_cb); QString getFilter(); #ifdef HAVE_LIBPCAP @@ -140,7 +140,7 @@ private: // Pipe input gint pipe_source_; gpointer pipe_user_data_; - int *pipe_child_process_; + intptr_t *pipe_child_process_; pipe_input_cb_t pipe_input_cb_; #ifdef _WIN32 QTimer *pipe_timer_; diff --git a/ui/ui_util.h b/ui/ui_util.h index b76e218951..5eba626104 100644 --- a/ui/ui_util.h +++ b/ui/ui_util.h @@ -25,6 +25,8 @@ #ifndef __UI_UTIL_H__ #define __UI_UTIL_H__ +#include <stdint.h> + #include "epan/packet_info.h" #include "epan/column-utils.h" @@ -56,7 +58,7 @@ extern void main_window_quit(void); /* read from a pipe (callback) */ typedef gboolean (*pipe_input_cb_t) (gint source, gpointer user_data); /* install callback function, called if pipe input is available */ -extern void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb); +extern void pipe_input_set_handler(gint source, gpointer user_data, intptr_t *child_process, pipe_input_cb_t input_cb); /* packet_list.c */ |