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

svn path=/trunk/; revision=16406

2 files changed, 9 insertions, 3 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
diff --git a/wiretap/file_util.h b/wiretap/file_util.h
index efc79007a8..7bad7a56a1 100644
--- a/wiretap/file_util.h
+++ b/wiretap/file_util.h
@@ -46,7 +46,6 @@ extern "C" {
 #include <glib/gstdio.h>	/* available since GLib 2.6 only! */
 
 /* GLib2.6 or above, using new wrapper functions */
-#define eth_mkstemp g_mkstemp
 #define eth_open	g_open
 #define eth_rename	g_rename
 #define eth_mkdir	g_mkdir
@@ -69,8 +68,6 @@ extern "C" {
 #define eth_unlink	unlink
 #endif
 
-#include "mkstemp.h"
-#define eth_mkstemp mkstemp
 #define eth_rename	rename
 #define eth_mkdir	mkdir
 #define eth_remove	remove