aboutsummaryrefslogtreecommitdiffstats
path: root/util.c
diff options
context:
space:
mode:
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2005-11-07 00:20:20 +0000
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2005-11-07 00:20:20 +0000
commit56a1f8177bec5fbdfb74360ec88c0b6e5fb7f8bc (patch)
tree2d14c2a57ec7e7622c4e0f45bce939d4ff40de62 /util.c
parentee5d4d0a5aa8400d68a7dfac9ba4be8d2c9142f0 (diff)
as mkstemp makes trouble and is only used once in util.c, move definition from file_util.h to util.c for now
this hopefully fixes the mkstemp problem git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16406 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'util.c')
-rw-r--r--util.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/util.c b/util.c
index 6b6298c70f..79411648a9 100644
--- a/util.c
+++ b/util.c
@@ -42,6 +42,15 @@
#include <epan/address.h>
#include <epan/addr_resolv.h>
+#if GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6)
+#include <glib/gstdio.h> /* available since GLib 2.6 only! */
+
+/* GLib2.6 or above, using new wrapper functions */
+#define eth_mkstemp g_mkstemp
+#else
+#define eth_mkstemp mkstemp
+#endif
+
/*
* This has to come after the include of <pcap.h>, as the include of
* <pcap.h> might cause <winsock2.h> to be included, and if we've