From: Irina Tirdea <irina.tir...@intel.com>

The mempcpy function is not supported by bionic in Android and will lead
to compilation errors.

Replacing mempcpy with memcpy so it will work in Android.

Signed-off-by: Irina Tirdea <irina.tir...@intel.com>
Cc: David Ahern <dsah...@gmail.com>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Namhyung Kim <namhyung....@lge.com>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
Cc: Steven Rostedt <rost...@goodmis.org>
Link: 
http://lkml.kernel.org/r/1347065004-15306-11-git-send-email-irina.tir...@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/lib/traceevent/event-parse.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c 
b/tools/lib/traceevent/event-parse.c
index 4595aeb..f4190b5 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4833,8 +4833,8 @@ int pevent_strerror(struct pevent *pevent, enum 
pevent_errno errnum,
                msg = strerror_r(errnum, buf, buflen);
                if (msg != buf) {
                        size_t len = strlen(msg);
-                       char *c = mempcpy(buf, msg, min(buflen-1, len));
-                       *c = '\0';
+                       memcpy(buf, msg, min(buflen - 1, len));
+                       *(buf + min(buflen - 1, len)) = '\0';
                }
                return 0;
        }
-- 
1.7.9.2.358.g22243

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to