From 03292c465464a1bb10b07ea5036ce64083984dd3 Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Wed, 17 Feb 2010 10:36:57 -0500 Subject: [PATCH] Add extern "C" to more header files. From partner. --- lib/dpif.h | 8 ++++++++ lib/poll-loop.h | 8 ++++++++ ofproto/ofproto.h | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/lib/dpif.h b/lib/dpif.h index bf3c6481..41101e7b 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -27,6 +27,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + struct dpif; struct ofpbuf; struct svec; @@ -93,4 +97,8 @@ void dpif_recv_wait(struct dpif *); void dpif_get_netflow_ids(const struct dpif *, uint8_t *engine_type, uint8_t *engine_id); +#ifdef __cplusplus +} +#endif + #endif /* dpif.h */ diff --git a/lib/poll-loop.h b/lib/poll-loop.h index 341d063b..47cf4c9e 100644 --- a/lib/poll-loop.h +++ b/lib/poll-loop.h @@ -34,6 +34,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + struct poll_waiter; /* Schedule events to wake up the following poll_block(). */ @@ -52,4 +56,8 @@ struct poll_waiter *poll_fd_callback(int fd, short int events, /* Cancel a file descriptor callback or event. */ void poll_cancel(struct poll_waiter *); +#ifdef __cplusplus +} +#endif + #endif /* poll-loop.h */ diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 6377e51e..3a9617af 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -24,6 +24,10 @@ #include "netflow.h" #include "tag.h" +#ifdef __cplusplus +extern "C" { +#endif + struct odp_actions; struct ofhooks; struct ofproto; @@ -123,4 +127,8 @@ struct ofhooks { void ofproto_revalidate(struct ofproto *, tag_type); struct tag_set *ofproto_get_revalidate_set(struct ofproto *); +#ifdef __cplusplus +} +#endif + #endif /* ofproto.h */ -- 2.30.2