[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "ice-util-restructure" updated.

[Commits to the Asterisk SCF project code repositories]

branch "ice-util-restructure" has been updated
       via  32daa42192eb825d33b6ccdd0cd72f7a9a810839 (commit)
      from  09a7d90b2ba90507c65db33bde8ffb4ae0bba9eb (commit)

Summary of changes:
 src/MediaRTPpjmedia.cpp            |    6 +++---
 src/RTPSession.cpp                 |    6 +++---
 src/RTPSink.cpp                    |    6 +++---
 src/RTPSource.cpp                  |    5 ++---
 src/RtpStateReplicatorApp.cpp      |    4 ++--
 src/RtpStateReplicatorListener.cpp |    5 ++---
 6 files changed, 15 insertions(+), 17 deletions(-)


- Log -----------------------------------------------------------------
commit 32daa42192eb825d33b6ccdd0cd72f7a9a810839
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Apr 28 16:09:59 2011 -0230

    Reordering of header files to address winsock redeclaration issues.

diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index df4ae23..ab63f28 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -14,13 +14,13 @@
  * at the top of the source tree.
  */
 
+#include <pjlib.h>
+#include <pjmedia.h>
+
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
 #include <IceUtil/UUID.h>
 
-#include <pjlib.h>
-#include <pjmedia.h>
-
 #include <boost/shared_ptr.hpp>
 
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index d2d9509..2cddb39 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -14,12 +14,12 @@
  * at the top of the source tree.
  */
 
-#include <Ice/Ice.h>
-#include <IceUtil/UUID.h>
-
 #include <pjlib.h>
 #include <pjmedia.h>
 
+#include <Ice/Ice.h>
+#include <IceUtil/UUID.h>
+
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
 #include <AsteriskSCF/System/Component/ReplicaIf.h>
diff --git a/src/RTPSink.cpp b/src/RTPSink.cpp
index 5e1ac17..5c591b3 100644
--- a/src/RTPSink.cpp
+++ b/src/RTPSink.cpp
@@ -14,12 +14,12 @@
  * at the top of the source tree.
  */
 
-#include <Ice/Ice.h>
-#include <IceUtil/UUID.h>
-
 #include <pjlib.h>
 #include <pjmedia.h>
 
+#include <Ice/Ice.h>
+#include <IceUtil/UUID.h>
+
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
 #include <AsteriskSCF/System/Component/ReplicaIf.h>
diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index c16007a..6a8e1a7 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -14,11 +14,10 @@
  * at the top of the source tree.
  */
 
-#include <Ice/Ice.h>
-#include <IceUtil/UUID.h>
-
 #include <pjlib.h>
 #include <pjmedia.h>
+#include <Ice/Ice.h>
+#include <IceUtil/UUID.h>
 
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
diff --git a/src/RtpStateReplicatorApp.cpp b/src/RtpStateReplicatorApp.cpp
index 78e8ae1..5c4476e 100644
--- a/src/RtpStateReplicatorApp.cpp
+++ b/src/RtpStateReplicatorApp.cpp
@@ -14,13 +14,13 @@
  * at the top of the source tree.
  */
 
+#include <pjlib.h>
+
 #include <Ice/Ice.h>
 #include <IceUtil/UUID.h>
 #include <IceStorm/IceStorm.h>
 #include <IceBox/IceBox.h>
 
-#include <pjlib.h>
-
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/System/Component/ComponentServiceIf.h>
 #include <AsteriskSCF/Logger/IceLogger.h>
diff --git a/src/RtpStateReplicatorListener.cpp b/src/RtpStateReplicatorListener.cpp
index b32b57e..fd5694c 100644
--- a/src/RtpStateReplicatorListener.cpp
+++ b/src/RtpStateReplicatorListener.cpp
@@ -13,15 +13,14 @@
  * the GNU General Public License Version 2. See the LICENSE.txt file
  * at the top of the source tree.
  */
+#include <pjlib.h>
+#include <pjmedia.h>
 
 #include <IceUtil/UUID.h>
 
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <pjlib.h>
-#include <pjmedia.h>
-
 #include <AsteriskSCF/System/Component/ReplicaIf.h>
 
 #include "RtpStateReplicator.h"

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_rtp_pjmedia.git