diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-11-04 00:45:54 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-11-04 08:46:30 +0000 |
commit | ff9f9fc43162f3271e8335aae9b03175a0f2e7ee (patch) | |
tree | 2a6db2a90c4a6229e1c902be890bdb52bf58f219 /wsutil/str_util.h | |
parent | 321934f2ff9665f62a8ad4b2b554b457c79fd610 (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 'wsutil/str_util.h')
-rw-r--r-- | wsutil/str_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wsutil/str_util.h b/wsutil/str_util.h index 43a60dca9d..997c8c6139 100644 --- a/wsutil/str_util.h +++ b/wsutil/str_util.h @@ -113,6 +113,9 @@ gchar *format_size(gint64 size, format_size_flags_e flags); WS_DLL_PUBLIC gchar printable_char_or_period(gchar c); +/* To pass one of two strings, singular or plural */ +#define plurality(d,s,p) ((d) == 1 ? (s) : (p)) + #ifdef __cplusplus } |