removed some MSVC warnings (moved pcap.h before glib.h)
svn path=/trunk/; revision=9393
This commit is contained in:
Ulf Lamping
parent
6126aad3b2
commit
3b77bfee59
|
|
@ -3,7 +3,7 @@
|
|||
* time, so that we only need one Ethereal binary and one Tethereal binary
|
||||
* for Windows, regardless of whether WinPcap is installed or not.
|
||||
*
|
||||
* $Id: capture-wpcap.c,v 1.6 2003/10/10 09:48:54 guy Exp $
|
||||
* $Id: capture-wpcap.c,v 1.7 2003/12/21 12:18:59 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -28,13 +28,13 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <gmodule.h>
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <gmodule.h>
|
||||
|
||||
#include "pcap-util.h"
|
||||
#include "pcap-util-int.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* capture.c
|
||||
* Routines for packet capture windows
|
||||
*
|
||||
* $Id: capture.c,v 1.219 2003/12/18 21:18:34 guy Exp $
|
||||
* $Id: capture.c,v 1.220 2003/12/21 12:18:59 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -68,6 +68,8 @@
|
|||
# include <io.h>
|
||||
#endif
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -95,8 +97,6 @@
|
|||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#ifdef NEED_SNPRINTF_H
|
||||
# include "snprintf.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* capture_combo_utils.c
|
||||
* Utilities for combo box of interface names
|
||||
*
|
||||
* $Id: capture_combo_utils.c,v 1.3 2003/11/03 10:36:45 guy Exp $
|
||||
* $Id: capture_combo_utils.c,v 1.4 2003/12/21 12:17:58 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -28,11 +28,10 @@
|
|||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
#include <pcap.h>
|
||||
#include <string.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#include "prefs.h"
|
||||
#include "pcap-util.h"
|
||||
#include "capture_combo_utils.h"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* capture_dlg.c
|
||||
* Routines for packet capture windows
|
||||
*
|
||||
* $Id: capture_dlg.c,v 1.89 2003/12/13 11:00:04 ulfl Exp $
|
||||
* $Id: capture_dlg.c,v 1.90 2003/12/21 12:17:58 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -28,11 +28,10 @@
|
|||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
#include <pcap.h>
|
||||
#include <string.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include "capture.h"
|
||||
#include "globals.h"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* capture_info_dlg.c
|
||||
* Routines for packet capture info dialog
|
||||
*
|
||||
* $Id: capture_info_dlg.c,v 1.7 2003/12/16 18:43:33 oabad Exp $
|
||||
* $Id: capture_info_dlg.c,v 1.8 2003/12/21 12:17:59 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -28,13 +28,12 @@
|
|||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
#include <pcap.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include "gtk/compat_macros.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include "../capture.h"
|
||||
#include "globals.h"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* capture_prefs.c
|
||||
* Dialog box for capture preferences
|
||||
*
|
||||
* $Id: capture_prefs.c,v 1.23 2003/09/26 23:11:17 guy Exp $
|
||||
* $Id: capture_prefs.c,v 1.24 2003/12/21 12:17:59 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -28,11 +28,10 @@
|
|||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
#include <pcap.h>
|
||||
#include <string.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#include "globals.h"
|
||||
#include "capture_prefs.h"
|
||||
#include "gtkglobals.h"
|
||||
|
|
|
|||
10
gtk/main.c
10
gtk/main.c
|
|
@ -1,6 +1,6 @@
|
|||
/* main.c
|
||||
*
|
||||
* $Id: main.c,v 1.345 2003/12/17 23:41:10 ulfl Exp $
|
||||
* $Id: main.c,v 1.346 2003/12/21 12:17:59 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -39,6 +39,10 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#endif
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <string.h>
|
||||
|
|
@ -52,10 +56,6 @@
|
|||
#include <io.h> /* open/close on win32 */
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#endif
|
||||
|
||||
#ifdef NEED_SNPRINTF_H
|
||||
# include "snprintf.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* pcap-util.c
|
||||
* Utility routines for packet capture
|
||||
*
|
||||
* $Id: pcap-util.c,v 1.22 2003/11/26 02:54:05 guy Exp $
|
||||
* $Id: pcap-util.c,v 1.23 2003/12/21 12:18:59 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -28,6 +28,8 @@
|
|||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
|
@ -42,8 +44,6 @@
|
|||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
#include <pcap.h>
|
||||
|
||||
#include <wtap.h>
|
||||
#include <wtap-capture.h>
|
||||
|
||||
|
|
|
|||
10
util.c
10
util.c
|
|
@ -1,7 +1,7 @@
|
|||
/* util.c
|
||||
* Utility routines
|
||||
*
|
||||
* $Id: util.c,v 1.74 2003/12/06 16:35:18 gram Exp $
|
||||
* $Id: util.c,v 1.75 2003/12/21 12:19:39 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -26,6 +26,10 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#endif /* HAVE_LIBPCAP */
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
|
@ -64,10 +68,6 @@ typedef int mode_t; /* for win32 */
|
|||
#include <pcre.h> /* to get the libpcre version number */
|
||||
#endif /* HAVE_LIBPCRE */
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#endif /* HAVE_LIBPCAP */
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* libpcap.c
|
||||
*
|
||||
* $Id: libpcap.c,v 1.104 2003/12/21 06:02:06 jmayer Exp $
|
||||
* $Id: libpcap.c,v 1.105 2003/12/21 12:17:05 ulfl Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
|
@ -24,6 +24,10 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_PCAP_H
|
||||
#include <pcap.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
|
@ -37,7 +41,6 @@
|
|||
# ifdef HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
# endif
|
||||
#include <pcap.h>
|
||||
#include "wtap-capture.h"
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue