diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-04-16 14:55:41 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-05-10 17:21:54 +0100 |
| commit | 415a9fb880c6bf383d649643a4ce65ea3bc9b084 (patch) | |
| tree | 0686b3279fe0540c7c885f62d91d2eb4b5d12b19 /include/sysemu | |
| parent | f16a3bf81b8b01c53144167f6cc12fb126028972 (diff) | |
| download | qemu-415a9fb880c6bf383d649643a4ce65ea3bc9b084.zip qemu-415a9fb880c6bf383d649643a4ce65ea3bc9b084.tar.gz qemu-415a9fb880c6bf383d649643a4ce65ea3bc9b084.tar.bz2 | |
osdep: Make os-win32.h and os-posix.h handle 'extern "C"' themselves
Both os-win32.h and os-posix.h include system header files. Instead
of having osdep.h include them inside its 'extern "C"' block, make
these headers handle that themselves, so that we don't include the
system headers inside 'extern "C"'.
This doesn't fix any current problems, but it's conceptually the
right way to handle system headers.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include/sysemu')
| -rw-r--r-- | include/sysemu/os-posix.h | 8 | ||||
| -rw-r--r-- | include/sysemu/os-win32.h | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h index 629c8c6..2edf336 100644 --- a/include/sysemu/os-posix.h +++ b/include/sysemu/os-posix.h @@ -38,6 +38,10 @@ #include <sys/sysmacros.h> #endif +#ifdef __cplusplus +extern "C" { +#endif + void os_set_line_buffering(void); void os_set_proc_name(const char *s); void os_setup_signal_handling(void); @@ -92,4 +96,8 @@ static inline void qemu_funlockfile(FILE *f) funlockfile(f); } +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 5346d51..43f569b 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -30,6 +30,10 @@ #include <windows.h> #include <ws2tcpip.h> +#ifdef __cplusplus +extern "C" { +#endif + #if defined(_WIN64) /* On w64, setjmp is implemented by _setjmp which needs a second parameter. * If this parameter is NULL, longjump does no stack unwinding. @@ -194,4 +198,8 @@ ssize_t qemu_recv_wrap(int sockfd, void *buf, size_t len, int flags); ssize_t qemu_recvfrom_wrap(int sockfd, void *buf, size_t len, int flags, struct sockaddr *addr, socklen_t *addrlen); +#ifdef __cplusplus +} +#endif + #endif |