aboutsummaryrefslogtreecommitdiffstats
path: root/ringbuffer.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-11-04 00:45:54 -0800
committerGuy Harris <guy@alum.mit.edu>2015-11-04 08:46:30 +0000
commitff9f9fc43162f3271e8335aae9b03175a0f2e7ee (patch)
tree2a6db2a90c4a6229e1c902be890bdb52bf58f219 /ringbuffer.h
parent321934f2ff9665f62a8ad4b2b554b457c79fd610 (diff)
Don't include "file.h" if you don't need it.
It ends up dragging in libwireshark headers, which programs not linking with libwireshark shouldn't do. In particular, including <epan/address.h> causes some functions that refer to libwireshark functions to be defined if the compiler doesn't handle "static inline" the way GCC does, and you end up requiring libwireshark even though you shouldn't require it. Move plurality() to wsutil/str_util.h, so that non-libwireshark code can get it without include epan/packet.h. Fix includes as necessary. Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3 Reviewed-on: https://code.wireshark.org/review/11545 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ringbuffer.h')
-rw-r--r--ringbuffer.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/ringbuffer.h b/ringbuffer.h
index ca322ae..b5f4776 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -24,7 +24,6 @@
#define __RINGBUFFER_H__
#include <stdio.h>
-#include "file.h"
#include "wiretap/wtap.h"
#define RINGBUFFER_UNLIMITED_FILES 0