4 files changed, 32 insertions, 0 deletions
diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h
index 2b3d878..14801ab 100644
--- a/lib/include/radsec/radsec-impl.h
+++ b/lib/include/radsec/radsec-impl.h
@@ -19,6 +19,10 @@ enum rs_cred_type {
 };
 typedef unsigned int rs_cred_type_t;
 
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
 struct rs_packet;
 
 struct rs_credentials {
@@ -108,6 +112,10 @@ int _rs_err_conn_push_err(struct rs_connection *conn,
 			  struct rs_error *err);
 
 
+#if defined (__cplusplus)
+}
+#endif
+
 /* Convenience macros.  */
 #define rs_calloc(h, nmemb, size) \
     (h->alloc_scheme.calloc ? h->alloc_scheme.calloc : calloc)(nmemb, size)
diff --git a/lib/include/radsec/radsec.h b/lib/include/radsec/radsec.h
index d80c296..c54180b 100644
--- a/lib/include/radsec/radsec.h
+++ b/lib/include/radsec/radsec.h
@@ -33,6 +33,10 @@ enum rs_conn_type {
 typedef unsigned int rs_conn_type_t;
 
 
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
 /* Data types.  */
 struct rs_context;		/* radsec-impl.h */
 struct rs_connection;		/* radsec-impl.h */
@@ -146,6 +150,10 @@ void rs_err_free(struct rs_error *err);
 char *rs_err_msg(struct rs_error *err, int dofree_flag);
 int rs_err_code(struct rs_error *err, int dofree_flag);
 
+#if defined (__cplusplus)
+}
+#endif
+
 /* Local Variables: */
 /* c-file-style: "stroustrup" */
 /* End: */
diff --git a/lib/include/radsec/request-impl.h b/lib/include/radsec/request-impl.h
index 339dfea..02b7713 100644
--- a/lib/include/radsec/request-impl.h
+++ b/lib/include/radsec/request-impl.h
@@ -1,5 +1,9 @@
 /* See the file COPYING for licensing information.  */
 
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
 struct rs_request
 {
   struct rs_connection *conn;
@@ -8,3 +12,7 @@ struct rs_request
   struct rs_packet *resp;
   struct rs_conn_callbacks saved_cb;
 };
+
+#if defined (__cplusplus)
+}
+#endif
diff --git a/lib/include/radsec/request.h b/lib/include/radsec/request.h
index 939345e..fed06b5 100644
--- a/lib/include/radsec/request.h
+++ b/lib/include/radsec/request.h
@@ -2,6 +2,14 @@
 
 struct rs_request;
 
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
 int rs_request_create(struct rs_connection *conn, struct rs_request **req_out);
 void rs_request_destroy(struct rs_request *request);
 int rs_request_send(struct rs_request *request, struct rs_packet *req, struct rs_packet **resp);
+
+#if defined (__cplusplus)
+}
+#endif