From 9fbfd6ab5526baa0980fd32cb2406728a0c1e801 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Mon, 24 Feb 2014 08:49:40 +0000 Subject: Misc (re #1630): Fixed missing PJ_DECL on pj_run_app() and bad type casts in WMME audio dev (thanks Louis Solomon for the report). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4760 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/include/pj/os.h | 8 +++++--- pjmedia/src/pjmedia-audiodev/wmme_dev.c | 4 ++-- 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); } -- cgit v1.2.3