Tweak ws_cpuid so that Valgrind is happy.

[metze/wireshark/wip.git] / capture_opts.h

diff --git a/capture_opts.h b/capture_opts.h
index 3e5a407359083e83daff9ce76162219c01731f25..da8981dcfb8d584a310075ffac506832a4869e65 100644 (file)
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
@@ -188,10 +188,8 @@ typedef struct interface_tag {
     if_info_t       if_info;
     gboolean        selected;
     gboolean        hidden;
-#ifdef HAVE_EXTCAP
     /* External capture cached data */
     GHashTable     *external_cap_args_settings;
-#endif
     gchar          *timestamp_type;
 } interface_t;
 
@@ -200,12 +198,6 @@ typedef struct link_row_tag {
     gint dlt;
 } link_row;
 
-#ifdef _WIN32
-#define INVALID_EXTCAP_PID INVALID_HANDLE_VALUE
-#else
-#define INVALID_EXTCAP_PID (GPid)-1
-#endif
-
 typedef struct interface_options_tag {
     gchar            *name;                 /* the name of the interface provided to winpcap/libpcap to specify the interface */
     gchar            *descr;
@@ -216,12 +208,11 @@ typedef struct interface_options_tag {
     int               linktype;
     gboolean          promisc_mode;
     interface_type    if_type;
-#ifdef HAVE_EXTCAP
     gchar            *extcap;
     gchar            *extcap_fifo;
     GHashTable       *extcap_args;
-    GPid              extcap_pid;           /* pid of running process or INVALID_EXTCAP_PID */
-    gpointer          extcap_userdata;
+    GPid              extcap_pid;           /* pid of running process or WS_INVALID_PID */
+    gpointer          extcap_pipedata;
     guint             extcap_child_watch;
 #ifdef _WIN32
     HANDLE            extcap_pipe_h;
@@ -230,7 +221,6 @@ typedef struct interface_options_tag {
 #endif
     gchar            *extcap_control_in;
     gchar            *extcap_control_out;
-#endif
 #ifdef CAN_SET_CAPTURE_BUFFER_SIZE
     int               buffer_size;
 #endif