Qt 5.2.1 - now with added native OS X toolbar!

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

diff --git a/capture_session.h b/capture_session.h
index fcbace1e9ef6c27edcf3fc57b5f2bbfffb1b70e5..758e98eb98be776f343044ad15d8788a8198fdec 100644 (file)
--- a/capture_session.h
+++ b/capture_session.h
@@ -25,6 +25,11 @@
 #ifndef __CAPTURE_SESSION_H__
 #define __CAPTURE_SESSION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef HAVE_LIBPCAP
 /* Current state of capture engine. XXX - differentiate states */
 typedef enum {
     CAPTURE_STOPPED,        /**< stopped */
@@ -35,7 +40,7 @@ typedef enum {
 /*
  * State of a capture session.
  */
-struct oh_shut_up_already {
+typedef struct {
     int fork_child;                 /**< If not -1, in parent, process ID of child */
     int fork_child_status;          /**< Child exit status */
 #ifdef _WIN32
@@ -49,11 +54,18 @@ struct oh_shut_up_already {
     gboolean session_started;
     capture_options *capture_opts;  /**< options for this capture */
     void *cf;                       /**< handle to cfile (note: untyped handle) */
-};
-
-typedef struct oh_shut_up_already capture_session;
+} capture_session;
 
 extern void
 capture_session_init(capture_session *cap_session, void *cf);
+#else
+
+typedef struct {} capture_session;
+
+#endif /* HAVE_LIBPCAP */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* __CAPTURE_SESSION_H__ */