osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Ulf Lamping 2005-11-07 00:20:20 +00:00
parent 5990cb095a
commit 937a50243c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util.c
View File

@ -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

3
wiretap/file_util.h
View File

@ -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