Changeset 4760 for pjproject


Ignore:
Timestamp:
Feb 24, 2014 8:49:40 AM (8 years ago)
Author:
nanang
Message:

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).

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/include/pj/os.h

    r3664 r4760  
    14401440 */ 
    14411441 
    1442 /* Type for main function. */ 
     1442/** 
     1443 * Type for application main function. 
     1444 */ 
    14431445typedef int (*pj_main_func_ptr)(int argc, char *argv[]); 
    14441446 
     
    14571459 * @return          main_func()'s return value. 
    14581460 */ 
    1459 int pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[], 
    1460                unsigned flags); 
     1461PJ_DECL(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[], 
     1462                        unsigned flags); 
    14611463 
    14621464/** @} */ 
  • pjproject/trunk/pjmedia/src/pjmedia-audiodev/wmme_dev.c

    r4537 r4760  
    743743    mr = waveOutOpen(&wmme_strm->hWave.Out,  
    744744                     wf->dev_info[prm->play_id].deviceId, 
    745                      &wfx, (DWORD)(pj_ssize_t)wmme_strm->hEvent, 0, flag); 
     745                     &wfx, (DWORD_PTR)wmme_strm->hEvent, 0, flag); 
    746746    if (mr != MMSYSERR_NOERROR) { 
    747747        return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr); 
     
    834834    mr = waveInOpen(&wmme_strm->hWave.In,  
    835835                    wf->dev_info[prm->rec_id].deviceId,  
    836                     &wfx, (DWORD)(pj_ssize_t)wmme_strm->hEvent, 0, flag); 
     836                    &wfx, (DWORD_PTR)wmme_strm->hEvent, 0, flag); 
    837837    if (mr != MMSYSERR_NOERROR) { 
    838838        return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr); 
Note: See TracChangeset for help on using the changeset viewer.