osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

"capture.c" doesn't do socket "ioctl"s any more - the code to do that is 

now in "gtk/capture_dlg.c" - so it doesn't need to include
<sys/sockio.h> on, for example, Solaris...

...but "gtk/capture_dlg.c" does need to include it.

"gtk/capture_dlg.c" also may need to include "snprintf.h", as it uses
"snprintf()".

svn path=/trunk/; revision=655
This commit is contained in:
Guy Harris 1999-09-11 06:23:28 +00:00
parent 72a668a88a
commit 4c6f416754
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
capture.c
View File

@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
* $Id: capture.c,v 1.66 1999/09/09 03:31:49 gram Exp $
* $Id: capture.c,v 1.67 1999/09/11 06:23:22 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -73,10 +73,6 @@
# include "snprintf.h"
#endif
#ifdef HAVE_SYS_SOCKIO_H
# include <sys/sockio.h>
#endif
#include "gtk/main.h"
#include "packet.h"
#include "file.h"

15
gtk/capture_dlg.c
View File

@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
* $Id: capture_dlg.c,v 1.1 1999/09/09 03:32:00 gram Exp $
* $Id: capture_dlg.c,v 1.2 1999/09/11 06:23:28 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -54,6 +54,19 @@
#include <signal.h>
#include <errno.h>
#ifdef NEED_SNPRINTF_H
# ifdef HAVE_STDARG_H
# include <stdarg.h>
# else
# include <varargs.h>
# endif
# include "snprintf.h"
#endif
#ifdef HAVE_SYS_SOCKIO_H
# include <sys/sockio.h>
#endif
#include <wiretap/wtap.h>
#include "capture.h"
#include "globals.h"