Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous fixes #3853

Merged
merged 5 commits into from
Aug 1, 2024
Merged

Miscellaneous fixes #3853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c70f1a3
Fix typo in SRTP error string
nanangizz Feb 6, 2024
5b3d347
Ignore python __pycache__ dirs in pjsua test
nanangizz Mar 26, 2024
a2bc014
Set PJ_HAS_STDINT_H on VS2010 or later, so logging will not truncate …
nanangizz Apr 16, 2024
38bc0ce
Add dialog event files to VS2005 project
nanangizz May 6, 2024
2b2f2ff
Merge branch 'master' into miscfix-2.14dev
sauwming Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ pjsip-apps/src/swig/python/pjsua2.py
pjsip-apps/src/swig/python/pjsua2_wrap.*

# unit tests files
tests/pjsua/**/__pycache__/
tests/pjsua/*.pyc
tests/pjsua/scripts-*/*.pyc
tests/pjsua/*.log
Expand Down
7 changes: 6 additions & 1 deletion pjlib/include/pj/compat/os_win32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@
#define PJ_HAS_SETJMP_H 1
#define PJ_HAS_STDARG_H 1
#define PJ_HAS_STDDEF_H 1
#undef PJ_HAS_STDINT_H
/* vs2010/msvc10 or later has stdint.h */
#if PJ_CC_VER_1 >= 16
# define PJ_HAS_STDINT_H 1
#else
# undef PJ_HAS_STDINT_H
#endif
#define PJ_HAS_STDIO_H 1
#define PJ_HAS_STDLIB_H 1
#define PJ_HAS_STRING_H 1
Expand Down
2 changes: 1 addition & 1 deletion pjmedia/src/pjmedia/transport_srtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ const char* get_libsrtp_errstr(int err)
"nonce check failed", /* err_status_nonce_bad = 18 */
"couldn't read data", /* err_status_read_fail = 19 */
"couldn't write data", /* err_status_write_fail = 20 */
"error pasring data", /* err_status_parse_err = 21 */
"error parsing data", /* err_status_parse_err = 21 */
"error encoding data", /* err_status_encode_err = 22 */
"error while using semaphores", /* err_status_semaphore_err = 23 */
"error while using pfkey" /* err_status_pfkey_err = 24 */
Expand Down
Loading
Loading