Skip to content

Commit d3d1298

Browse files
nanangizzsauwming
andauthored
Miscellaneous fixes (#3853)
* Fix typo in SRTP error string * Ignore python __pycache__ dirs in pjsua test * Set PJ_HAS_STDINT_H on VS2010 or later, so logging will not truncate senders (some senders are object names containing 64bit memory address). * Add dialog event files to VS2005 project --------- Co-authored-by: sauwming <[email protected]>
1 parent 1a82f90 commit d3d1298

File tree

4 files changed

+178
-156
lines changed

4 files changed

+178
-156
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ pjsip-apps/src/swig/python/pjsua2.py
6262
pjsip-apps/src/swig/python/pjsua2_wrap.*
6363

6464
# unit tests files
65+
tests/pjsua/**/__pycache__/
6566
tests/pjsua/*.pyc
6667
tests/pjsua/scripts-*/*.pyc
6768
tests/pjsua/*.log

pjlib/include/pj/compat/os_win32.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@
4545
#define PJ_HAS_SETJMP_H 1
4646
#define PJ_HAS_STDARG_H 1
4747
#define PJ_HAS_STDDEF_H 1
48-
#undef PJ_HAS_STDINT_H
48+
/* vs2010/msvc10 or later has stdint.h */
49+
#if PJ_CC_VER_1 >= 16
50+
# define PJ_HAS_STDINT_H 1
51+
#else
52+
# undef PJ_HAS_STDINT_H
53+
#endif
4954
#define PJ_HAS_STDIO_H 1
5055
#define PJ_HAS_STDLIB_H 1
5156
#define PJ_HAS_STRING_H 1

pjmedia/src/pjmedia/transport_srtp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ const char* get_libsrtp_errstr(int err)
472472
"nonce check failed", /* err_status_nonce_bad = 18 */
473473
"couldn't read data", /* err_status_read_fail = 19 */
474474
"couldn't write data", /* err_status_write_fail = 20 */
475-
"error pasring data", /* err_status_parse_err = 21 */
475+
"error parsing data", /* err_status_parse_err = 21 */
476476
"error encoding data", /* err_status_encode_err = 22 */
477477
"error while using semaphores", /* err_status_semaphore_err = 23 */
478478
"error while using pfkey" /* err_status_pfkey_err = 24 */

0 commit comments

Comments
 (0)