diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
| commit | 0a669967fa719111db64437f7dd3b2869091f9e8 (patch) | |
| tree | 35aa1a3589fe2927087c1482683afaccb0183c89 /mergecap.c | |
| parent | d331c33b4ff4f5ce6c001a040db5ba1a0ded1c60 (diff) | |
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mergecap.c b/mergecap.c index 35609ee074..e8cae5d43f 100644 --- a/mergecap.c +++ b/mergecap.c @@ -44,19 +44,15 @@ #include "wtap.h" #ifndef HAVE_GETOPT -#include "wsutil/wsgetopt.h" +#include <wsutil/wsgetopt.h> #endif -#include "wsutil/strnatcmp.h" +#include <wsutil/strnatcmp.h> +#include <wsutil/file_util.h> -#define WS_BUILD_DLL -#define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */ -#undef WS_BUILD_DLL -#define RESET_SYMBOL_EXPORT +#include <wiretap/merge.h> #include "svnversion.h" -#include "merge.h" -#include "wsutil/file_util.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> |