From 2d30d5beb13d0ab9485c05186ad8ddf7a808ef58 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Tue, 16 Jul 2013 01:16:50 +0000 Subject: 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 --- mergecap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mergecap.c') 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 -- cgit v1.2.3