osdep: protect qemu/osdep.h with extern "C"
commit875df03b221ef6a67f175f1f283ea5598f717da5
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 16 Apr 2021 13:55:39 +0000 (16 14:55 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 17 Apr 2021 17:44:30 +0000 (17 18:44 +0100)
treeafa41befe0e39563bbdac0d256f53bc47f94a26d
parentaf1bb59c07c889c59cc22322d6eccb678991a299
osdep: protect qemu/osdep.h with extern "C"

System headers may include templates if compiled with a C++ compiler,
which cause the compiler to complain if qemu/osdep.h is included
within a C++ source file's 'extern "C"' block.  Add
an 'extern "C"' block directly to qemu/osdep.h, so that
system headers can be kept out of it.

There is a stray declaration early in qemu/osdep.h, which needs
to be special cased.  Add a definition in qemu/compiler.h to
make it look nice.

config-host.h, CONFIG_TARGET, exec/poison.h and qemu/compiler.h
are included outside the 'extern "C"' block; that is not
an issue because they consist entirely of preprocessor directives.

This allows us to move the include of osdep.h in our two C++
source files outside the extern "C" block they were previously
using for it, which in turn means that they compile successfully
against newer versions of glib which insist that glib.h is
*not* inside an extern "C" block.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210416135543.20382-3-peter.maydell@linaro.org
[PMM: Moved disas/arm-a64.cc osdep.h include out of its extern "C" block;
 explained in commit message why we're doing this]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
disas/arm-a64.cc
disas/nanomips.cpp
include/qemu/compiler.h
include/qemu/osdep.h