diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | editcap.c | 4 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/Makefile.common | 2 | ||||
| -rw-r--r-- | mergecap.c | 3 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | wsutil/Makefile.common | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | wsutil/strnatcmp.c (renamed from epan/strnatcmp.c) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | wsutil/strnatcmp.h (renamed from epan/strnatcmp.h) | 0 |
10 files changed, 8 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 367076779b..5761253086 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -930,7 +930,6 @@ if(BUILD_mergecap) set(mergecap_FILES mergecap.c merge.c - epan/strnatcmp.c svnversion.h ${WTAP_PLUGIN_SOURCES} ) @@ -984,7 +983,6 @@ if(BUILD_editcap) set(editcap_FILES editcap.c epan/crypt/md5.c - epan/strnatcmp.c ${WTAP_PLUGIN_SOURCES} ) add_executable(editcap ${editcap_FILES}) diff --git a/Makefile.common b/Makefile.common index 4f5cb333cc..8ee66f40b8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -150,14 +150,12 @@ text2pcap_INCLUDES = \ # mergecap specifics mergecap_SOURCES = \ mergecap.c \ - merge.c \ - epan/strnatcmp.c + merge.c # editcap specifics editcap_SOURCES = \ editcap.c \ epan/crypt/md5.c \ - epan/strnatcmp.c \ $(WTAP_PLUGIN_SOURCES) # reordercap specifics @@ -76,7 +76,8 @@ #endif #include <wsutil/privileges.h> -#include "wsutil/report_err.h" +#include <wsutil/report_err.h> +#include <wsutil/strnatcmp.h> /* * The symbols declared in the below are exported from libwireshark, @@ -89,7 +90,6 @@ #include "epan/crypt/md5.h" #include "epan/plugins.h" #include "epan/filesystem.h" -#include "epan/strnatcmp.h" #undef WS_BUILD_DLL #define RESET_SYMBOL_EXPORT diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 8b8d3efd25..d1080ec797 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1485,7 +1485,6 @@ set(LIBWIRESHARK_FILES sna-utils.c stat_cmd_args.c stats_tree.c - strnatcmp.c strutil.c stream.c t35.c diff --git a/epan/Makefile.common b/epan/Makefile.common index c8a142bb70..480f16ce22 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -86,7 +86,6 @@ LIBWIRESHARK_SRC = \ sna-utils.c \ stat_cmd_args.c \ stats_tree.c \ - strnatcmp.c \ strutil.c \ stream.c \ t35.c \ @@ -243,7 +242,6 @@ LIBWIRESHARK_INCLUDES = \ stats_tree.h \ stats_tree_priv.h \ stream.h \ - strnatcmp.h \ strutil.h \ t35.h \ tap.h \ 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 diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index adeb364ea4..0864101435 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -49,6 +49,7 @@ set(WSUTIL_FILES mpeg-audio.c nstime.c privileges.c + strnatcmp.c str_util.c report_err.c tempfile.c diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index f334d5f95b..dd15f9fb51 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -43,6 +43,7 @@ LIBWSUTIL_SRC = \ mpeg-audio.c \ nstime.c \ privileges.c \ + strnatcmp.c \ str_util.c \ report_err.c \ tempfile.c \ @@ -63,6 +64,7 @@ LIBWSUTIL_INCLUDES = \ mpeg-audio.h \ nstime.h \ privileges.h \ + strnatcmp.h \ str_util.h \ report_err.h \ tempfile.h \ diff --git a/epan/strnatcmp.c b/wsutil/strnatcmp.c index ee4d14e8cc..ee4d14e8cc 100755..100644 --- a/epan/strnatcmp.c +++ b/wsutil/strnatcmp.c diff --git a/epan/strnatcmp.h b/wsutil/strnatcmp.h index 221ddbda3f..221ddbda3f 100755..100644 --- a/epan/strnatcmp.h +++ b/wsutil/strnatcmp.h |