- pcap.h needs to be included before capture.h

- As capture.h is empty without libpcap defined, only include it in that
  case and don't protect the file internally against libpcap any more.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13648 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 2 insertions, 4 deletions

diff --git a/capture.h b/capture.h
index 8c5f017394..76e60ecf9f 100644
--- a/capture.h
+++ b/capture.h
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+/* This file should only be included if libpcap is present */
+
 #ifndef __CAPTURE_H__
 #define __CAPTURE_H__
 
@@ -29,8 +31,6 @@
  *  Capture related things.
  */
 
-#ifdef HAVE_LIBPCAP
-
 /** Name we give to the child process when doing a "-S" capture. */
 #define	CHILD_NAME	"ethereal-capture"
 
@@ -156,6 +156,4 @@ extern void capture_info_destroy(
 capture_info    *cinfo);
 
 
-#endif /* HAVE_LIBPCAP */
-
 #endif /* capture.h */