aboutsummaryrefslogtreecommitdiffstats
path: root/u3.h
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2012-01-21 18:56:01 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2012-01-21 18:56:01 +0000
commit94e4fa3e7661779c0a6efbdf75634573e2cea90d (patch)
treede9e6fe3ba59d4c6e4d45970228b46972d9098b1 /u3.h
parent3a4a342cbcbd9c7b105d88925a56191d7007e7e4 (diff)
Fix -v for QtShark
./Wireshark -v wireshark 1.7.1 (SVN Rev Unknown from unknown) Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8, with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt 1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27 2011 11:52:20), without AirPcap. Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version 1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0. Built using gcc 4.6.1. get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c the function is common to GTK and Qt need to put in version_info.[ch] ? svn path=/trunk/; revision=40633
Diffstat (limited to 'u3.h')
-rw-r--r--u3.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/u3.h b/u3.h
index 326363b087..ceff3395b2 100644
--- a/u3.h
+++ b/u3.h
@@ -25,6 +25,10 @@
#ifndef __U3_H__
#define __U3_H__
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
gboolean u3_active(void);
void u3_runtime_info(GString *str);
@@ -35,4 +39,8 @@ void u3_deregister_pid(void);
char * u3_expand_device_path(char *path);
char * u3_contract_device_path(char *path);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif /* __U3_H__ */