From 9e0f84f270d4f54a9fcd6fefc7abc4f3cafa0e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 27 Jul 2023 16:02:21 -0400
Subject: [PATCH] include all pj headers in extern "C"
Change-Id: I704857602be0c65751721331707b1a9928f4785b
---
include/ice_transport_factory.h | 10 ++++++----
src/fileutils.cpp | 2 ++
src/ice_transport.cpp | 2 ++
src/sip_utils.h | 2 ++
src/turn/turn_transport.cpp | 2 ++
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/include/ice_transport_factory.h b/include/ice_transport_factory.h
index 03aef10..df3367c 100644
--- a/include/ice_transport_factory.h
+++ b/include/ice_transport_factory.h
@@ -20,14 +20,16 @@
#include "ice_transport.h"
#include "ip_utils.h"
-#include <pjnath.h>
-#include <pjlib.h>
-#include <pjlib-util.h>
-
#include <functional>
#include <memory>
#include <vector>
+extern "C" {
+#include <pjnath.h>
+#include <pjlib.h>
+#include <pjlib-util.h>
+}
+
namespace dhtnet {
class IceTransportFactory
diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index b6194d2..c8dbdc0 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -71,8 +71,10 @@
#include <cstddef>
#include <ciso646>
+extern "C" {
#include <pj/ctype.h>
#include <pjlib-util/md5.h>
+}
#include <filesystem>
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index a257c92..47a67e6 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -26,7 +26,9 @@
#include <opendht/logger.h>
#include <opendht/utils.h>
+extern "C" {
#include <pjlib.h>
+}
#include <map>
#include <atomic>
diff --git a/src/sip_utils.h b/src/sip_utils.h
index 0349b04..9038d8a 100644
--- a/src/sip_utils.h
+++ b/src/sip_utils.h
@@ -24,7 +24,9 @@
#include <cstring> // strcmp
#include <memory>
+extern "C" {
#include <pjlib.h>
+}
namespace dhtnet {
namespace sip_utils {
diff --git a/src/turn/turn_transport.cpp b/src/turn/turn_transport.cpp
index c847e28..3cf78d2 100644
--- a/src/turn/turn_transport.cpp
+++ b/src/turn/turn_transport.cpp
@@ -23,9 +23,11 @@
#include <functional>
#include <stdexcept>
+extern "C" {
#include <pjnath.h>
#include <pjlib-util.h>
#include <pjlib.h>
+}
#define TRY(ret) \
do { \
--
GitLab