remove unnecessary extern "C" blocks
A handful of header files in QEMU are wrapped with extern "C" blocks. These are not necessary: there are C++ source files anymore in QEMU, and even where there were some, they did not include most of these files anyway. Remove them for consistency. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
808d15b383
commit
d76aa73fad
@ -11,10 +11,6 @@
|
|||||||
|
|
||||||
#include "qemu/bswap.h"
|
#include "qemu/bswap.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef void *PTR;
|
typedef void *PTR;
|
||||||
typedef uint64_t bfd_vma;
|
typedef uint64_t bfd_vma;
|
||||||
typedef int64_t bfd_signed_vma;
|
typedef int64_t bfd_signed_vma;
|
||||||
@ -506,8 +502,4 @@ static inline bfd_vma bfd_getb16(const bfd_byte *addr)
|
|||||||
|
|
||||||
typedef bool bfd_boolean;
|
typedef bool bfd_boolean;
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* DISAS_DIS_ASM_H */
|
#endif /* DISAS_DIS_ASM_H */
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
#ifndef BSWAP_H
|
#ifndef BSWAP_H
|
||||||
#define BSWAP_H
|
#define BSWAP_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef bswap16
|
#undef bswap16
|
||||||
#define bswap16(_x) __builtin_bswap16(_x)
|
#define bswap16(_x) __builtin_bswap16(_x)
|
||||||
#undef bswap32
|
#undef bswap32
|
||||||
@ -395,8 +391,4 @@ DO_STN_LDN_P(be)
|
|||||||
#undef le_bswaps
|
#undef le_bswaps
|
||||||
#undef be_bswaps
|
#undef be_bswaps
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* BSWAP_H */
|
#endif /* BSWAP_H */
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
#ifndef ENVLIST_H
|
#ifndef ENVLIST_H
|
||||||
#define ENVLIST_H
|
#define ENVLIST_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct envlist envlist_t;
|
typedef struct envlist envlist_t;
|
||||||
|
|
||||||
envlist_t *envlist_create(void);
|
envlist_t *envlist_create(void);
|
||||||
@ -15,8 +11,4 @@ int envlist_parse_set(envlist_t *, const char *);
|
|||||||
int envlist_parse_unset(envlist_t *, const char *);
|
int envlist_parse_unset(envlist_t *, const char *);
|
||||||
char **envlist_to_environ(const envlist_t *, size_t *);
|
char **envlist_to_environ(const envlist_t *, size_t *);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* ENVLIST_H */
|
#endif /* ENVLIST_H */
|
||||||
|
@ -31,10 +31,6 @@
|
|||||||
#include "qemu/sys_membarrier.h"
|
#include "qemu/sys_membarrier.h"
|
||||||
#include "qemu/coroutine-tls.h"
|
#include "qemu/coroutine-tls.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Important !
|
* Important !
|
||||||
*
|
*
|
||||||
@ -196,8 +192,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock)
|
|||||||
void rcu_add_force_rcu_notifier(Notifier *n);
|
void rcu_add_force_rcu_notifier(Notifier *n);
|
||||||
void rcu_remove_force_rcu_notifier(Notifier *n);
|
void rcu_remove_force_rcu_notifier(Notifier *n);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* QEMU_RCU_H */
|
#endif /* QEMU_RCU_H */
|
||||||
|
@ -28,11 +28,6 @@
|
|||||||
#include "qemu/queue.h"
|
#include "qemu/queue.h"
|
||||||
#include "qemu/atomic.h"
|
#include "qemu/atomic.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* List access methods.
|
* List access methods.
|
||||||
*/
|
*/
|
||||||
@ -311,7 +306,4 @@ extern "C" {
|
|||||||
(var) && ((next) = qatomic_rcu_read(&(var)->field.sle_next), 1); \
|
(var) && ((next) = qatomic_rcu_read(&(var)->field.sle_next), 1); \
|
||||||
(var) = (next))
|
(var) = (next))
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif /* QEMU_RCU_QUEUE_H */
|
#endif /* QEMU_RCU_QUEUE_H */
|
||||||
|
@ -53,10 +53,6 @@
|
|||||||
#ifndef QEMU_URI_H
|
#ifndef QEMU_URI_H
|
||||||
#define QEMU_URI_H
|
#define QEMU_URI_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* URI:
|
* URI:
|
||||||
*
|
*
|
||||||
@ -105,7 +101,4 @@ struct QueryParams *query_params_new (int init_alloc);
|
|||||||
extern QueryParams *query_params_parse (const char *query);
|
extern QueryParams *query_params_parse (const char *query);
|
||||||
extern void query_params_free (QueryParams *ps);
|
extern void query_params_free (QueryParams *ps);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif /* QEMU_URI_H */
|
#endif /* QEMU_URI_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user