diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-27 14:55:30 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-27 22:55:53 +0000 |
| commit | 8c86fbc0be458546004462e8735fa93bc9dc3e01 (patch) | |
| tree | fb93cfca967f5dff959283c0b012727bb0ab592f | |
| parent | 81fa9e05fffe788cdec02b1f3f12612daa826c6b (diff) | |
<string.h>, not <memory.h>, is the header file for memcpy().
Don't include <memory.h> when using memcpy(), include <string.h>.
We don't need to check for memory.h, so don't do it in CMake (we don't
explicitly check for it in autoconf, but it's checked for by some macro
we do use).
Change-Id: I7aa93d4ea93bab9beff597939d3c24aecda3d52e
Reviewed-on: https://code.wireshark.org/review/7433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | plugins/easy_codec/codec-g722.c | 3 | ||||
| -rw-r--r-- | plugins/easy_codec/codec-g7231.c | 3 | ||||
| -rw-r--r-- | plugins/easy_codec/codec-g729a.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index f1ae7f22ac..2a522fcd16 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -30,7 +30,6 @@ check_include_file("fcntl.h" HAVE_FCNTL_H) check_include_file("getopt.h" HAVE_GETOPT_H) check_include_file("grp.h" HAVE_GRP_H) check_include_file("inttypes.h" HAVE_INTTYPES_H) -check_include_file("memory.h" HAVE_MEMORY_H) check_include_file("netinet/in.h" HAVE_NETINET_IN_H) check_include_file("netdb.h" HAVE_NETDB_H) # We need to set the path to Wpdpack in order to find Ntddndis.h diff --git a/plugins/easy_codec/codec-g722.c b/plugins/easy_codec/codec-g722.c index a2ab6d10b8..8394f53014 100644 --- a/plugins/easy_codec/codec-g722.c +++ b/plugins/easy_codec/codec-g722.c @@ -23,8 +23,9 @@ #include "config.h" +#include <string.h> + #include <glib.h> -#include <memory.h> #include "codec-g722.h" diff --git a/plugins/easy_codec/codec-g7231.c b/plugins/easy_codec/codec-g7231.c index 0a90218f9c..d2c65ee31f 100644 --- a/plugins/easy_codec/codec-g7231.c +++ b/plugins/easy_codec/codec-g7231.c @@ -23,8 +23,9 @@ #include "config.h" +#include <string.h> + #include <glib.h> -#include <memory.h> #include "codec-g7231.h" diff --git a/plugins/easy_codec/codec-g729a.c b/plugins/easy_codec/codec-g729a.c index 2a5efac2c7..154c6722fb 100644 --- a/plugins/easy_codec/codec-g729a.c +++ b/plugins/easy_codec/codec-g729a.c @@ -23,8 +23,9 @@ #include "config.h" +#include <string.h> + #include <glib.h> -#include <memory.h> #include "codec-g729a.h" |