Changeset 4760 for pjproject

Timestamp:

Feb 24, 2014 8:49:40 AM (11 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:

• pjlib/include/pj/os.h (modified) (2 diffs)
• pjmedia/src/pjmedia-audiodev/wmme_dev.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/os.h

@@ -1440 +1440 @@
  */
 
-/* Type for main function. */
+/**
+ * Type for application main function.
+ */
 typedef int (*pj_main_func_ptr)(int argc, char *argv[]);
 
@@ -1457 +1459 @@
  * @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);
 
 /** @} */

pjproject/trunk/pjmedia/src/pjmedia-audiodev/wmme_dev.c

@@ -743 +743 @@
     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);
@@ -834 +834 @@
     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);