aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2013-07-16 01:16:50 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2013-07-16 01:16:50 +0000
commit2d30d5beb13d0ab9485c05186ad8ddf7a808ef58 (patch)
tree3cf6fb2b9c9c3afbbb416f3c4a27a9ec46c1e987 /mergecap.c
parente4bb3006675e70e4e35fe481c9dcb6c4994ab0eb (diff)
Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific
there and moving it avoids having to recompile the file for use in editcap and mergecap (which don't link against libwireshark). svn path=/trunk/; revision=50650
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c
index 74b0c004aa..35609ee074 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -47,9 +47,10 @@
#include "wsutil/wsgetopt.h"
#endif
+#include "wsutil/strnatcmp.h"
+
#define WS_BUILD_DLL
#define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */
-#include "epan/strnatcmp.h"
#undef WS_BUILD_DLL
#define RESET_SYMBOL_EXPORT