From b243c73cf4dc7017e28577c4056df0655427a76e Mon Sep 17 00:00:00 2001 From: Xuzhou Cheng Date: Wed, 24 Aug 2022 17:40:03 +0800 Subject: tests/qtest: libqos: Rename malloc.h to libqos-malloc.h The qtest/libqos directory is included via the "-I" option to search for header files when building qtest. Unfortunately the malloc.h has a name conflict with the standard libc header, leading to a build failure on the Windows host, due to the MinGW libc stdlib.h header file includes malloc.h and it now gets wrongly pointed to the one in the qtest/libqos directory. Rename "qtest/libqos/malloc.h" to "qtest/libqos/libqos-malloc.h" to avoid the namespace pollution. Signed-off-by: Xuzhou Cheng Signed-off-by: Bin Meng Reviewed-by: Thomas Huth Message-Id: <20220824094029.1634519-26-bmeng.cn@gmail.com> Signed-off-by: Thomas Huth --- tests/qtest/libqos/qos_external.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/qtest/libqos/qos_external.h') diff --git a/tests/qtest/libqos/qos_external.h b/tests/qtest/libqos/qos_external.h index 8446e3df0b..ea37364887 100644 --- a/tests/qtest/libqos/qos_external.h +++ b/tests/qtest/libqos/qos_external.h @@ -21,7 +21,7 @@ #include "qgraph.h" -#include "malloc.h" +#include "libqos-malloc.h" #include "qapi/qapi-types-machine.h" #include "qapi/qapi-types-qom.h" -- cgit 1.4.1