aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2007-09-25 23:23:56 +0000
committerUlf Lamping <ulf.lamping@web.de>2007-09-25 23:23:56 +0000
commit9194ddf3994a2cc4df8378e31ad26ee20a86f150 (patch)
treec6b6ee87f117ac9f60267570ce88c9f0ca1b21c2 /tshark.c
parent3fd5cf55b0312c63ece273f42fb5f3c732aa72b8 (diff)
add a dummy function, so unix/linux version should at least compile
svn path=/trunk/; revision=22974
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/tshark.c b/tshark.c
index d74f3ccbe1..bbaf15ceef 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1615,6 +1615,7 @@ typedef struct pipe_input_tag {
static pipe_input_t pipe_input;
+#ifdef _WIN32
/* The timer has expired, see if there's stuff to read from the pipe,
if so, do the callback */
static gint
@@ -1674,6 +1675,17 @@ pipe_timer_cb(gpointer data)
/* we didn't stopped the timer, so let it run */
return TRUE;
}
+#else
+/* The timer has expired, see if there's stuff to read from the pipe,
+ if so, do the callback */
+static gint
+pipe_timer_cb(gpointer data)
+{
+ /* XXX - this has to be implemented */
+ g_assert(0);
+}
+#endif
+
void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb)
{
@@ -1693,9 +1705,12 @@ void pipe_input_set_handler(gint source, gpointer user_data, int *child_process,
/*g_log(NULL, G_LOG_LEVEL_DEBUG, "pipe_input_set_handler: new");*/
pipe_input.pipe_input_id = g_timeout_add(200, pipe_timer_cb, &pipe_input);
#else
- /* XXX - in gui_utils.c, this was:
+ pipe_input.pipe_input_id = g_timeout_add(200, pipe_timer_cb, &pipe_input);
+
+ /* XXX - in gui_utils.c, this was:
* pipe_input->pipe_input_id = gtk_input_add_full (source,
* GDK_INPUT_READ|GDK_INPUT_EXCEPTION, */
+#if 0
pipe_input.pipe_input_id = g_input_add_full(source,
200,
pipe_input_cb,
@@ -1703,6 +1718,7 @@ void pipe_input_set_handler(gint source, gpointer user_data, int *child_process,
&pipe_input,
NULL);
#endif
+#endif
}