summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pjlib/include/pj/os.h8
-rw-r--r--pjmedia/src/pjmedia-audiodev/wmme_dev.c4
2 files changed, 7 insertions, 5 deletions
diff --git a/pjlib/include/pj/os.h b/pjlib/include/pj/os.h
index 3ce877af..8cf9bcd9 100644
--- a/pjlib/include/pj/os.h
+++ b/pjlib/include/pj/os.h
@@ -1439,7 +1439,9 @@ PJ_DECL(pj_uint32_t) pj_elapsed_cycle( const pj_timestamp *start,
* @{
*/
-/* Type for main function. */
+/**
+ * Type for application main function.
+ */
typedef int (*pj_main_func_ptr)(int argc, char *argv[]);
/**
@@ -1456,8 +1458,8 @@ typedef int (*pj_main_func_ptr)(int argc, char *argv[]);
*
* @return main_func()'s return value.
*/
-int pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[],
- unsigned flags);
+PJ_DECL(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[],
+ unsigned flags);
/** @} */
diff --git a/pjmedia/src/pjmedia-audiodev/wmme_dev.c b/pjmedia/src/pjmedia-audiodev/wmme_dev.c
index a73f2474..a9618c5e 100644
--- a/pjmedia/src/pjmedia-audiodev/wmme_dev.c
+++ b/pjmedia/src/pjmedia-audiodev/wmme_dev.c
@@ -742,7 +742,7 @@ static pj_status_t init_player_stream( struct wmme_factory *wf,
*/
mr = waveOutOpen(&wmme_strm->hWave.Out,
wf->dev_info[prm->play_id].deviceId,
- &wfx, (DWORD)(pj_ssize_t)wmme_strm->hEvent, 0, flag);
+ &wfx, (DWORD_PTR)wmme_strm->hEvent, 0, flag);
if (mr != MMSYSERR_NOERROR) {
return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
}
@@ -833,7 +833,7 @@ static pj_status_t init_capture_stream( struct wmme_factory *wf,
*/
mr = waveInOpen(&wmme_strm->hWave.In,
wf->dev_info[prm->rec_id].deviceId,
- &wfx, (DWORD)(pj_ssize_t)wmme_strm->hEvent, 0, flag);
+ &wfx, (DWORD_PTR)wmme_strm->hEvent, 0, flag);
if (mr != MMSYSERR_NOERROR) {
return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);
}