Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h

@@ -29,6 +29,12 @@
 
 #ifndef AUDIORTPRECORDHANDLER_H_
 #define AUDIORTPRECORDHANDLER_H_
+#include <cstddef>
+
+using std::ptrdiff_t;
+
+#include <ccrtp/rtp.h>
+#include <list>
 
 #include "sip/sipcall.h"
 #include "audio/codecs/audiocodec.h"
@@ -39,8 +45,6 @@
 #include "audio/echosuppress.h"
 #include "audio/gaincontrol.h"
 #include "managerimpl.h"
-#include <ccrtp/rtp.h>
-#include <list>
 
 namespace sfl
 {

sflphone-common/src/audio/audiortp/AudioRtpSession.h

@@ -37,6 +37,7 @@
 #include <iostream>
 #include <exception>
 #include <list>
+#include <cstddef>
 
 #include "global.h"
 
@@ -46,6 +47,7 @@
 
 #include "managerimpl.h"
 
+using std::ptrdiff_t;
 #include <ccrtp/rtp.h>
 #include <ccrtp/iqueue.h>
 #include <cc++/numbers.h> // ost::Time

sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.h

@@ -28,7 +28,9 @@
  */
 #ifndef __SFL_AUDIO_SYMMETRIC_RTP_SESSION_H__
 #define __SFL_AUDIO_SYMMETRIC_RTP_SESSION_H__
+#include <cstddef>
 
+using std::ptrdiff_t;
 #include <ccrtp/rtp.h>
 
 #include "AudioRtpSession.h"

sflphone-common/src/audio/audiortp/AudioZrtpSession.h

@@ -30,8 +30,10 @@
 #ifndef __SFL_AUDIO_ZRTP_SESSION_H__
 #define __SFL_AUDIO_ZRTP_SESSION_H__
 
-#include <ccrtp/rtp.h>
+#include <cstddef>
 
+using std::ptrdiff_t;
+#include <ccrtp/rtp.h>
 #include <libzrtpcpp/zrtpccrtp.h>
 #include <libzrtpcpp/ZrtpQueue.h>
 #include <libzrtpcpp/ZrtpUserCallback.h>