From b14b006d560f08a808b7e92a5edf6cb733574df3 Mon Sep 17 00:00:00 2001 From: Vanilla Hsu Date: Tue, 27 Oct 2020 11:04:52 +0800 Subject: [PATCH] php8.0 compatibility. --- .travis.yml | 10 +++++----- php_qrencode.h | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 464c84b..ce3b851 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ language: php sudo: required -dist: precise +dist: focal php: - - 5.5 - - 5.6 + - 7.4 + - 8.0 env: global: - - PHPIZE_BIN="$(which phpize 2> /dev/null || which phpize5 2> /dev/null)" + - PHPIZE_BIN="$(which phpize 2> /dev/null)" before_script: - $PHPIZE_BIN &> /dev/null @@ -20,4 +20,4 @@ addons: apt: packages: - libqrencode-dev - - libpng-dev + - libpng12-dev diff --git a/php_qrencode.h b/php_qrencode.h index c639170..3b86f68 100644 --- a/php_qrencode.h +++ b/php_qrencode.h @@ -21,6 +21,21 @@ extern zend_module_entry qrencode_module_entry; #define phpext_qrencode_ptr &qrencode_module_entry +#if PHP_VERSION_ID >= 80000 +#ifndef TSRMLS_C +#define TSRMLS_C +#endif +#ifndef TSRMLS_CC +#define TSRMLS_CC +#endif +#ifndef TSRMLS_D +#define TSRMLS_D +#endif +#ifndef TSRMLS_DC +#define TSRMLS_DC +#endif +#endif + #ifdef PHP_WIN32 #define PHP_QRENCODE_API __declspec(dllexport) #else @@ -31,7 +46,7 @@ extern zend_module_entry qrencode_module_entry; #include "TSRM.h" #endif -#define PHP_QRENCODE_VERSION "0.6" +#define PHP_QRENCODE_VERSION "0.7" PHP_MINIT_FUNCTION(qrencode); PHP_MSHUTDOWN_FUNCTION(qrencode);