From c1fcde59b2c8506bd169da40328f7311d373daed Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 15:25:58 -0400 Subject: [PATCH] wrapper: remove inline_memcpy.h --- lib/ringbuffer/backend_internal.h | 2 +- wrapper/inline_memcpy.h | 10 ---------- wrapper/ringbuffer/backend_internal.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 wrapper/inline_memcpy.h diff --git a/lib/ringbuffer/backend_internal.h b/lib/ringbuffer/backend_internal.h index 5ad6fac2..99074963 100644 --- a/lib/ringbuffer/backend_internal.h +++ b/lib/ringbuffer/backend_internal.h @@ -484,7 +484,7 @@ void lttng_inline_memcpy(void *dest, const void *src, *(uint64_t *) dest = *(const uint64_t *) src; break; default: - inline_memcpy(dest, src, len); + memcpy(dest, src, len); } } diff --git a/wrapper/inline_memcpy.h b/wrapper/inline_memcpy.h deleted file mode 100644 index 700c2d79..00000000 --- a/wrapper/inline_memcpy.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) - * - * wrapper/inline_memcpy.h - * - * Copyright (C) 2010-2012 Mathieu Desnoyers - */ - -#if !defined(__HAVE_ARCH_INLINE_MEMCPY) && !defined(inline_memcpy) -#define inline_memcpy memcpy -#endif diff --git a/wrapper/ringbuffer/backend_internal.h b/wrapper/ringbuffer/backend_internal.h index d48c2317..3bb1586e 100644 --- a/wrapper/ringbuffer/backend_internal.h +++ b/wrapper/ringbuffer/backend_internal.h @@ -1,3 +1,2 @@ /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include #include -- 2.34.1