diff mbox series

[PULL,31/31] slirp: API is extern C

Message ID	20190127120526.15457-32-samuel.thibault@ens-lyon.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> From: Samuel Thibault <samuel.thibault@ens-lyon.org> To: qemu-devel@nongnu.org Date: Sun, 27 Jan 2019 13:05:26 +0100 Message-Id: <20190127120526.15457-32-samuel.thibault@ens-lyon.org> In-Reply-To: <20190127120526.15457-1-samuel.thibault@ens-lyon.org> References: <20190127120526.15457-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 31/31] slirp: API is extern C Precedence: list Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>, Samuel Thibault <samuel.thibault@ens-lyon.org>, stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	[PULL,01/31] slirp: Avoid unaligned 16bit memory access \| expand [PULL,01/31] slirp: Avoid unaligned 16bit memory access [PULL,02/31] slirp: Avoid marking naturally packed structs as QEMU_PACKED [PULL,03/31] slirp: Don't mark struct ipq or struct ipasfrag as packed [PULL,04/31] slirp: generalize guestfwd with a callback based approach [PULL,05/31] net/slirp: simplify checking for cmd: prefix [PULL,06/31] net/slirp: free forwarding rules on cleanup [PULL,07/31] net/slirp: fix leaks on forwarding rule registration error [PULL,08/31] slirp: add callbacks for timer [PULL,09/31] slirp: replace trace functions with DEBUG calls [PULL,10/31] slirp: replace QEMU_PACKED with SLIRP_PACKED [PULL,11/31] slirp: replace most qemu socket utilities with slirp own version [PULL,12/31] slirp: replace qemu_set_nonblock() [PULL,13/31] slirp: add unregister_poll_fd() callback [PULL,14/31] slirp: replace qemu_notify_event() with a callback [PULL,15/31] slirp: move QEMU state saving to a separate unit [PULL,16/31] slirp: do not include qemu headers in libslirp.h public API header [PULL,17/31] slirp: improve windows headers inclusion [PULL,18/31] slirp: add slirp own version of pstrcpy [PULL,19/31] slirp: remove qemu timer.h dependency [PULL,20/31] slirp: remove now useless QEMU headers inclusions [PULL,21/31] slirp: replace net/eth.h inclusion with own defines [PULL,22/31] slirp: replace qemu qtailq with slirp own copy [PULL,23/31] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT [PULL,24/31] slirp: replace remaining qemu headers dependency [PULL,25/31] slirp: prefer c99 types over BSD kind [PULL,26/31] slirp: improve send_packet() callback [PULL,27/31] slirp: replace global polling with per-instance & notifier [PULL,28/31] slirp: remove slirp_instances list [PULL,29/31] slirp: use polling callbacks, drop glib requirement [PULL,30/31] slirp: pass opaque to all callbacks [PULL,31/31] slirp: API is extern C

Commit Message

Samuel Thibault Jan. 27, 2019, 12:05 p.m. UTC

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Make it possible to use headers easily with C++ projects.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 slirp/libslirp.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 9b13d8250c..fccab42518 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -12,6 +12,10 @@ 
 #include <arpa/inet.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct Slirp Slirp;
 
 enum {
@@ -96,5 +100,8 @@  void slirp_socket_recv(Slirp *slirp, struct in_addr guest_addr,
                        int guest_port, const uint8_t *buf, int size);
 size_t slirp_socket_can_recv(Slirp *slirp, struct in_addr guest_addr,
                              int guest_port);
-
+#ifdef __cplusplus
+} /* extern "C" */
 #endif
+
+#endif /* LIBSLIRP_H */