@@ -845,8 +845,7 @@ void AmB2BMedia::replaceConnectionAddress(AmSdp &parser_sdp, bool a_leg,

   if (it != parser_sdp.media.end()) {

     // FIXME: create new streams here?

     WARN("trying to relay SDP with more media lines than "

-	 "relay streams initialized (%lu)\n", 

-	 (unsigned long)(audio.size()+relay_streams.size()));

+	 "relay streams initialized (%zu)\n",audio.size()+relay_streams.size());

   }

   DBG("replaced connection address in SDP with %s:%s.\n",

@@ -84,10 +84,10 @@ AmB2BSession::~AmB2BSession()

 {

   clearRtpReceiverRelay();

-  DBG("relayed_req.size() = %u\n",(unsigned int)relayed_req.size());

+  DBG("relayed_req.size() = %zu\n",relayed_req.size());

   map<int,AmSipRequest>::iterator it = recvd_req.begin();

-  DBG("recvd_req.size() = %u\n",(unsigned int)recvd_req.size());

+  DBG("recvd_req.size() = %zu\n",recvd_req.size());

   for(;it != recvd_req.end(); ++it){

     DBG("  <%i,%s>\n",it->first,it->second.method.c_str());

   }

@@ -707,7 +707,7 @@ void AmBasicSipDialog::dump()

 {

   DBG("callid = %s\n",callid.c_str());

   DBG("local_tag = %s\n",local_tag.c_str());

-  DBG("uac_trans.size() = %u\n",(unsigned int)uac_trans.size());

+  DBG("uac_trans.size() = %zu\n",uac_trans.size());

   if(uac_trans.size()){

     for(TransMap::iterator it = uac_trans.begin();

 	it != uac_trans.end(); it++){

@@ -715,7 +715,7 @@ void AmBasicSipDialog::dump()

       DBG("    cseq = %i; method = %s\n",it->first,it->second.method.c_str());

     }

   }

-  DBG("uas_trans.size() = %u\n",(unsigned int)uas_trans.size());

+  DBG("uas_trans.size() = %zu\n",uas_trans.size());

   if(uas_trans.size()){

     for(TransMap::iterator it = uas_trans.begin();

 	it != uas_trans.end(); it++){

@@ -239,8 +239,7 @@ void AmEventDispatcher::dump()

     for (size_t i=0;i<EVENT_DISPATCHER_BUCKETS;i++) {

       queues_mut[i].lock();

       if(!queues[i].empty()) {

-	DBG("queues[%lu].size() = %lu",

-	    (unsigned long)i,(unsigned long)queues[i].size());

+	DBG("queues[%zu].size() = %zu",i,queues[i].size());

 	for(EvQueueMapIter it = queues[i].begin();

 	    it != queues[i].end(); it++){

 	  DBG("\t%s -> %p\n",it->first.c_str(),it->second.q);

@@ -250,8 +249,7 @@ void AmEventDispatcher::dump()

       id_lookup_mut[i].lock();

       if(!id_lookup[i].empty()) {

-	DBG("id_lookup[%lu].size() = %lu",

-	    (unsigned long)i,(unsigned long)id_lookup[i].size());

+	DBG("id_lookup[%zu].size() = %zu",i,id_lookup[i].size());

       }

       id_lookup_mut[i].unlock();

     }