Skip to content

Commit

Permalink
remove unnecessary extern "C" blocks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bonzini committed Feb 8, 2023
1 parent fb0e4a6 commit 940e82d
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 47 deletions.
8 changes: 0 additions & 8 deletions include/disas/dis-asm.h
Expand Up @@ -11,10 +11,6 @@

#include "qemu/bswap.h"

#ifdef __cplusplus
extern "C" {
#endif

typedef void *PTR;
typedef uint64_t bfd_vma;
typedef int64_t bfd_signed_vma;
Expand Down Expand Up @@ -506,8 +502,4 @@ static inline bfd_vma bfd_getb16(const bfd_byte *addr)

typedef bool bfd_boolean;

#ifdef __cplusplus
}
#endif

#endif /* DISAS_DIS_ASM_H */
8 changes: 0 additions & 8 deletions include/qemu/bswap.h
@@ -1,10 +1,6 @@
#ifndef BSWAP_H
#define BSWAP_H

#ifdef __cplusplus
extern "C" {
#endif

#undef bswap16
#define bswap16(_x) __builtin_bswap16(_x)
#undef bswap32
Expand Down Expand Up @@ -395,8 +391,4 @@ DO_STN_LDN_P(be)
#undef le_bswaps
#undef be_bswaps

#ifdef __cplusplus
}
#endif

#endif /* BSWAP_H */
8 changes: 0 additions & 8 deletions include/qemu/envlist.h
@@ -1,10 +1,6 @@
#ifndef ENVLIST_H
#define ENVLIST_H

#ifdef __cplusplus
extern "C" {
#endif

typedef struct envlist envlist_t;

envlist_t *envlist_create(void);
Expand All @@ -15,8 +11,4 @@ int envlist_parse_set(envlist_t *, const char *);
int envlist_parse_unset(envlist_t *, const char *);
char **envlist_to_environ(const envlist_t *, size_t *);

#ifdef __cplusplus
}
#endif

#endif /* ENVLIST_H */
8 changes: 0 additions & 8 deletions include/qemu/rcu.h
Expand Up @@ -31,10 +31,6 @@
#include "qemu/sys_membarrier.h"
#include "qemu/coroutine-tls.h"

#ifdef __cplusplus
extern "C" {
#endif

/*
* Important !
*
Expand Down Expand Up @@ -196,8 +192,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock)
void rcu_add_force_rcu_notifier(Notifier *n);
void rcu_remove_force_rcu_notifier(Notifier *n);

#ifdef __cplusplus
}
#endif

#endif /* QEMU_RCU_H */
8 changes: 0 additions & 8 deletions include/qemu/rcu_queue.h
Expand Up @@ -28,11 +28,6 @@
#include "qemu/queue.h"
#include "qemu/atomic.h"

#ifdef __cplusplus
extern "C" {
#endif


/*
* List access methods.
*/
Expand Down Expand Up @@ -311,7 +306,4 @@ extern "C" {
(var) && ((next) = qatomic_rcu_read(&(var)->field.sle_next), 1); \
(var) = (next))

#ifdef __cplusplus
}
#endif
#endif /* QEMU_RCU_QUEUE_H */
7 changes: 0 additions & 7 deletions include/qemu/uri.h
Expand Up @@ -53,10 +53,6 @@
#ifndef QEMU_URI_H
#define QEMU_URI_H

#ifdef __cplusplus
extern "C" {
#endif

/**
* URI:
*
Expand Down Expand Up @@ -105,7 +101,4 @@ struct QueryParams *query_params_new (int init_alloc);
extern QueryParams *query_params_parse (const char *query);
extern void query_params_free (QueryParams *ps);

#ifdef __cplusplus
}
#endif
#endif /* QEMU_URI_H */

0 comments on commit 940e82d

Please sign in to comment.