kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ESL adjustments for PHP 7+

This commit is contained in:
cdosoftei 2019-10-02 14:05:58 -04:00
parent 6f8d65c348
commit d60193c1ae
No known key found for this signature in database
GPG Key ID: 565390F4CBD2DB84
5 changed files with 837 additions and 1012 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1661,7 +1661,7 @@ if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
PHP=php PHP=php
PHP_CONFIG=php-config PHP_CONFIG=php-config
PHP_LDFLAGS="`$PHP_CONFIG --ldflags`" PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`" PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre2-8|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto|argon2|sodium)//g'`"
PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`" PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`" PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`" PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"

2
libs/esl/php/ESL.php
View File

@ -2,7 +2,7 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.2 * Version 3.0.12
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make

2
libs/esl/php/Makefile.am
View File

@ -3,7 +3,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function
all: ESL.so all: ESL.so
esl_wrap.cpp: esl_wrap.cpp:
swig3.0 -module ESL -php5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -php7 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
sed -e 's/ char \*type_name;/ const char \*type_name;/' -i esl_wrap.cpp sed -e 's/ char \*type_name;/ const char \*type_name;/' -i esl_wrap.cpp
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp

1721
libs/esl/php/esl_wrap.cpp
View File

File diff suppressed because it is too large Load Diff

14
libs/esl/php/php_ESL.h
View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.2 * Version 3.0.12
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make
@ -20,16 +20,6 @@ extern zend_module_entry ESL_module_entry;
# define PHP_ESL_API # define PHP_ESL_API
#endif #endif
#ifdef ZTS
#include "TSRM.h"
#endif
PHP_MINIT_FUNCTION(ESL);
PHP_MSHUTDOWN_FUNCTION(ESL);
PHP_RINIT_FUNCTION(ESL);
PHP_RSHUTDOWN_FUNCTION(ESL);
PHP_MINFO_FUNCTION(ESL);
ZEND_NAMED_FUNCTION(_wrap_ESLevent_event_set); ZEND_NAMED_FUNCTION(_wrap_ESLevent_event_set);
ZEND_NAMED_FUNCTION(_wrap_ESLevent_event_get); ZEND_NAMED_FUNCTION(_wrap_ESLevent_event_get);
ZEND_NAMED_FUNCTION(_wrap_ESLevent_serialized_string_set); ZEND_NAMED_FUNCTION(_wrap_ESLevent_serialized_string_set);
@ -69,4 +59,6 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setAsyncExecute);
ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setEventLock); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setEventLock);
ZEND_NAMED_FUNCTION(_wrap_ESLconnection_disconnect); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_disconnect);
ZEND_NAMED_FUNCTION(_wrap_eslSetLogLevel); ZEND_NAMED_FUNCTION(_wrap_eslSetLogLevel);
PHP_MINIT_FUNCTION(ESL);
#endif /* PHP_ESL_H */ #endif /* PHP_ESL_H */