mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-27 13:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

osdep: protect qemu/osdep.h with extern "C"

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2021-04-16 14:55:39 +01:00 committed by Peter Maydell
parent af1bb59c07
commit 875df03b22
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disas/arm-a64.cc
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
extern "C" {
#include "qemu/osdep.h" #include "qemu/osdep.h"
extern "C" {
#include "disas/dis-asm.h" #include "disas/dis-asm.h"
} }

2
disas/nanomips.cpp
View File

@ -27,8 +27,8 @@
* Reference Manual", Revision 01.01, April 27, 2018 * Reference Manual", Revision 01.01, April 27, 2018
*/ */
extern "C" {
#include "qemu/osdep.h" #include "qemu/osdep.h"
extern "C" {
#include "disas/dis-asm.h" #include "disas/dis-asm.h"
} }

6
include/qemu/compiler.h
View File

@ -11,6 +11,12 @@
#define QEMU_STATIC_ANALYSIS 1 #define QEMU_STATIC_ANALYSIS 1
#endif #endif
#ifdef __cplusplus
#define QEMU_EXTERN_C extern "C"
#else
#define QEMU_EXTERN_C extern
#endif
#define QEMU_NORETURN __attribute__ ((__noreturn__)) #define QEMU_NORETURN __attribute__ ((__noreturn__))
#define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result))

10
include/qemu/osdep.h
View File

@ -57,7 +57,7 @@
#define daemon qemu_fake_daemon_function #define daemon qemu_fake_daemon_function
#include <stdlib.h> #include <stdlib.h>
#undef daemon #undef daemon
extern int daemon(int, int); QEMU_EXTERN_C int daemon(int, int);
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
@ -118,6 +118,10 @@ extern int daemon(int, int);
*/ */
#include "glib-compat.h" #include "glib-compat.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef _WIN32 #ifdef _WIN32
#include "sysemu/os-win32.h" #include "sysemu/os-win32.h"
#endif #endif
@ -728,4 +732,8 @@ static inline int platform_does_not_support_system(const char *command)
} }
#endif /* !HAVE_SYSTEM_FUNCTION */ #endif /* !HAVE_SYSTEM_FUNCTION */
#ifdef __cplusplus
}
#endif
#endif #endif