diff options
| author | Xuzhou Cheng | 2022-08-24 11:40:03 +0200 |
|---|---|---|
| committer | Thomas Huth | 2022-08-29 15:28:51 +0200 |
| commit | b243c73cf4dc7017e28577c4056df0655427a76e (patch) | |
| tree | 3c4b4117e8b7cc2eff623d043bf90ae32cb26dc4 /tests/qtest/libqos/virtio.h | |
| parent | tests/qtest: libqos: Drop inclusion of <sys/wait.h> (diff) | |
| download | qemu-b243c73cf4dc7017e28577c4056df0655427a76e.tar.gz qemu-b243c73cf4dc7017e28577c4056df0655427a76e.tar.xz qemu-b243c73cf4dc7017e28577c4056df0655427a76e.zip | |
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 <xuzhou.cheng@windriver.com>
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220824094029.1634519-26-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/qtest/libqos/virtio.h')
| -rw-r--r-- | tests/qtest/libqos/virtio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qtest/libqos/virtio.h b/tests/qtest/libqos/virtio.h index b8bd06e1b8..7adc7cbd10 100644 --- a/tests/qtest/libqos/virtio.h +++ b/tests/qtest/libqos/virtio.h @@ -10,7 +10,7 @@ #ifndef LIBQOS_VIRTIO_H #define LIBQOS_VIRTIO_H -#include "malloc.h" +#include "libqos-malloc.h" #include "standard-headers/linux/virtio_ring.h" #define QVIRTIO_F_BAD_FEATURE 0x40000000ull |