From d46bbd5db035f90e95f967678d7e02115c2312de Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 27 Jun 2011 17:54:09 -0400
Subject: [PATCH] * #6282: forward declare sdpMedia in sdp.h
---
sflphone-common/src/sip/sdp.cpp | 1 +
sflphone-common/src/sip/sdp.h | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index 7e66c344e7..92be7e3afa 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -31,6 +31,7 @@
*/
#include "sdp.h"
+#include "sdpmedia.h"
#include "global.h"
#include "manager.h"
#define ZRTP_VERSION "1.10"
diff --git a/sflphone-common/src/sip/sdp.h b/sflphone-common/src/sip/sdp.h
index 99c23a7413..7534d409dd 100644
--- a/sflphone-common/src/sip/sdp.h
+++ b/sflphone-common/src/sip/sdp.h
@@ -41,11 +41,12 @@
#include <pj/pool.h>
#include <pj/assert.h>
#include <vector>
-
-#include "sdpmedia.h"
-
+#include <string>
#include <exception>
+#include "global.h" // FIXME: CodecOrder shouldn't be in global.h
+class sdpMedia;
+
namespace sfl {
class AudioCodec;
}
--
GitLab