Changeset 6152

Timestamp:

Feb 4, 2020 4:47:32 AM (4 years ago)

Author:

nanang

Message:

Close #2265: Fixed compatibility issues on Python 3.7 or above.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/swig/python/Makefile (modified) (1 diff)
• pjsip/include/pjsua2/call.hpp (modified) (1 diff)
• pjsip/src/pjsua2/endpoint.cpp (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/swig/python/Makefile

@@ -4 +4 @@
 
 ifeq ($(USE_PYTHON3),1)
-  PYTHON_EXE=python3.6
-  PYTHON_PKG_DIR=$(HOME)/.local/lib/python3.6/site-packages
+  PYTHON_EXE=python3
 else
-  PYTHON_EXE=python2.7
-  PYTHON_PKG_DIR=$(HOME)/.local/lib/python2.7/site-packages
+  PYTHON_EXE=python2
 endif
 
 #PYTHON_SETUP_FLAGS = --inplace 
 ifeq ($(OS),Windows_NT)
+  PYTHON_PKG_DIR := $(shell $(PYTHON_EXE) -m site --user-site | sed 's/\\/\//g')
   PYTHON_SETUP_FLAGS += --compiler=mingw32
   GCC_EXE=gcc.exe
 else
+  PYTHON_PKG_DIR := $(shell $(PYTHON_EXE) -m site --user-site)
   GCC_EXE=
 endif

pjproject/trunk/pjsip/include/pjsua2/call.hpp

@@ -894 +894 @@
      * the re-INVITE.
      */
-    bool                async;
+    bool                isAsync;
     
     /**

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1336 +1336 @@
     prm.offer.fromPj(*offer);
     prm.rdata.fromPj(*rdata);
-    prm.async = PJ2BOOL(*async);
+    prm.isAsync = PJ2BOOL(*async);
     prm.statusCode = *code;
     prm.opt.fromPj(*opt);
@@ -1342 +1342 @@
     call->onCallRxReinvite(prm);
     
-    *async = prm.async;
+    *async = prm.isAsync;
     *code = prm.statusCode;
     *opt = prm.opt.toPj();