From d7aa4332dae06ae890053dd13239ddabee46b86c Mon Sep 17 00:00:00 2001
From: Riza Sulistyo <riza@teluu.com>
Date: Wed, 19 Jun 2013 06:47:43 +0000
Subject: Re #1680: Add initial support for Win64

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4537 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjmedia/include/pjmedia-audiodev/config.h | 1 +
 pjmedia/include/pjmedia/circbuf.h         | 7 ++++---
 pjmedia/include/pjmedia/frame.h           | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'pjmedia/include')

diff --git a/pjmedia/include/pjmedia-audiodev/config.h b/pjmedia/include/pjmedia-audiodev/config.h
index 66f45a72..b05f822d 100644
--- a/pjmedia/include/pjmedia-audiodev/config.h
+++ b/pjmedia/include/pjmedia-audiodev/config.h
@@ -50,6 +50,7 @@ PJ_BEGIN_DECL
  */
 #ifndef PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO
 #   if (defined(PJ_WIN32) && PJ_WIN32!=0) || \
+       (defined(PJ_WIN64) && PJ_WIN64!=0) || \
        (defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0)
 #	define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO	0
 #   else
diff --git a/pjmedia/include/pjmedia/circbuf.h b/pjmedia/include/pjmedia/circbuf.h
index eb3a0740..de23e6cc 100644
--- a/pjmedia/include/pjmedia/circbuf.h
+++ b/pjmedia/include/pjmedia/circbuf.h
@@ -216,7 +216,8 @@ PJ_INLINE(void) pjmedia_circ_buf_get_read_regions(pjmedia_circ_buf *circbuf,
     *reg1 = circbuf->start;
     *reg1_len = circbuf->len;
     if (*reg1 + *reg1_len > circbuf->buf + circbuf->capacity) {
-	*reg1_len = circbuf->buf + circbuf->capacity - circbuf->start;
+	*reg1_len = (unsigned)(circbuf->buf + circbuf->capacity - 
+			       circbuf->start);
 	*reg2 = circbuf->buf;
 	*reg2_len = circbuf->len - *reg1_len;
     } else {
@@ -252,9 +253,9 @@ PJ_INLINE(void) pjmedia_circ_buf_get_write_regions(pjmedia_circ_buf *circbuf,
 	*reg1 -= circbuf->capacity;
     *reg1_len = circbuf->capacity - circbuf->len;
     if (*reg1 + *reg1_len > circbuf->buf + circbuf->capacity) {
-	*reg1_len = circbuf->buf + circbuf->capacity - *reg1;
+	*reg1_len = (unsigned)(circbuf->buf + circbuf->capacity - *reg1);
 	*reg2 = circbuf->buf;
-	*reg2_len = circbuf->start - circbuf->buf;
+	*reg2_len = (unsigned)(circbuf->start - circbuf->buf);
     } else {
 	*reg2 = NULL;
 	*reg2_len = 0;
diff --git a/pjmedia/include/pjmedia/frame.h b/pjmedia/include/pjmedia/frame.h
index 0dda5e27..4c5ef672 100644
--- a/pjmedia/include/pjmedia/frame.h
+++ b/pjmedia/include/pjmedia/frame.h
@@ -231,7 +231,7 @@ pjmedia_frame_ext_pop_subframes(pjmedia_frame_ext *frm, unsigned n)
 {
     pjmedia_frame_ext_subframe *sf;
     pj_uint8_t *move_src;
-    unsigned move_len;
+    pj_size_t move_len;
 
     if (frm->subframe_cnt <= n) {
 	frm->subframe_cnt = 0;
@@ -241,8 +241,8 @@ pjmedia_frame_ext_pop_subframes(pjmedia_frame_ext *frm, unsigned n)
 
     move_src = (pj_uint8_t*)pjmedia_frame_ext_get_subframe(frm, n);
     sf = pjmedia_frame_ext_get_subframe(frm, frm->subframe_cnt-1);
-    move_len = (pj_uint8_t*)sf - move_src + sizeof(sf->bitlen) +
-	       ((sf->bitlen+7) >> 3);
+    move_len = ((pj_uint8_t*)sf - move_src + sizeof(sf->bitlen) +
+	       ((sf->bitlen+7) >> 3));
     pj_memmove((pj_uint8_t*)frm+sizeof(pjmedia_frame_ext),
 	       move_src, move_len);
 
-- 
cgit v1.2.3