diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-12-18 11:58:22 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-12-18 11:58:22 +0000 |
| commit | 2977bde9f17853c3f44ec553b67ae492f96948bb (patch) | |
| tree | 6f44fa98de93f310020cc4bf061b9c4b2a95239e | |
| parent | 4e254a907ce4f7bfd2d3492188d80495924191ac (diff) | |
| download | wireshark-2977bde9f17853c3f44ec553b67ae492f96948bb.tar.gz | |
- Make dumpcap build with the new bundle.
- Use the correct bundle id for GTK3
svn path=/trunk/; revision=46586
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | dumpcap.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index a1aafd234f..5ad984b939 100644 --- a/config.nmake +++ b/config.nmake @@ -272,7 +272,7 @@ PKG_SUFIX=ws GDK_DLL=libgdk-3-0.dll GTK_DLL=libgtk-3-0.dll PKG_SUFIX=ws -GTK_PKG=3.4.2-2.9 +GTK_PKG=3.4.0-3.9 #GTK_PKG=3.4.4-2.1 !ENDIF @@ -2128,7 +2128,11 @@ cap_pipe_open_live(char *pipename, } #ifdef _WIN32 else { +#if GLIB_CHECK_VERSION(2,31,0) + g_thread_new("cap_pipe_open_live", &cap_thread_read, pcap_opts); +#else g_thread_create(&cap_thread_read, pcap_opts, FALSE, NULL); +#endif pcap_opts->cap_pipe_buf = (char *) &magic; pcap_opts->cap_pipe_bytes_read = 0; |