diff options
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-sctp.c | 2 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | wsutil/Makefile.common | 2 | ||||
| -rw-r--r-- | wsutil/adler32.c (renamed from epan/adler32.c) | 0 | ||||
| -rw-r--r-- | wsutil/adler32.h (renamed from epan/adler32.h) | 0 |
7 files changed, 4 insertions, 4 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 2ce735f158..80b50fa9b1 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1453,7 +1453,6 @@ set(LIBWIRESHARK_FILES addr_and_mask.c addr_resolv.c address_to_str.c - adler32.c afn.c app_mem_usage.c asn1.c diff --git a/epan/Makefile.common b/epan/Makefile.common index 90666751f1..793d0eb736 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -27,7 +27,6 @@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \ address_to_str.c \ - adler32.c \ afn.c \ app_mem_usage.c \ asn1.c \ @@ -150,7 +149,6 @@ LIBWIRESHARK_INCLUDES = \ addr_and_mask.h \ addr_resolv.h \ address.h \ - adler32.h \ afn.h \ aftypes.h \ app_mem_usage.h \ diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index accee12851..4702137981 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -64,7 +64,7 @@ #include <epan/expert.h> #include <epan/show_exception.h> #include <wsutil/crc32.h> -#include <epan/adler32.h> +#include <wsutil/adler32.h> #include "packet-sctp.h" diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index f1ce424472..c107aca54f 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -36,6 +36,7 @@ IF(WIN32) ENDIF(WIN32) set(WSUTIL_FILES + adler32.c aes.c airpdcap_wep.c crash_info.c diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index a01ecee98a..2dd37efe05 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -29,6 +29,7 @@ # generated from YACC or Lex files (as Automake doesn't want them in # _SOURCES variables). LIBWSUTIL_SRC = \ + adler32.c \ aes.c \ airpdcap_wep.c \ crash_info.c \ @@ -60,6 +61,7 @@ LIBWSUTIL_SRC = \ # Header files that are not generated from other files LIBWSUTIL_INCLUDES = \ + adler32.h \ aes.h \ bits_ctz.h \ bits_count_ones.h \ diff --git a/epan/adler32.c b/wsutil/adler32.c index 542876dc6f..542876dc6f 100644 --- a/epan/adler32.c +++ b/wsutil/adler32.c diff --git a/epan/adler32.h b/wsutil/adler32.h index 14221eb7f0..14221eb7f0 100644 --- a/epan/adler32.h +++ b/wsutil/adler32.h |