summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-02-27 14:55:30 -0800
committerGuy Harris <guy@alum.mit.edu>2015-02-27 22:55:53 +0000
commit8c86fbc0be458546004462e8735fa93bc9dc3e01 (patch)
treefb93cfca967f5dff959283c0b012727bb0ab592f /plugins
parent81fa9e05fffe788cdec02b1f3f12612daa826c6b (diff)
downloadwireshark-8c86fbc0be458546004462e8735fa93bc9dc3e01.tar.gz
<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>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/easy_codec/codec-g722.c3
-rw-r--r--plugins/easy_codec/codec-g7231.c3
-rw-r--r--plugins/easy_codec/codec-g729a.c3
3 files changed, 6 insertions, 3 deletions
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"