Skip to content

Commit 487db05

Browse files
authored
Merge pull request #444 from sodabrew/remove-tsrmls-macro
2 parents 7443d16 + 26e38cc commit 487db05

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.travis/travis.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ function install_libmemcached() {
6767
}
6868

6969
function install_igbinary() {
70-
git clone https://github.com/igbinary/igbinary.git
70+
git clone https://github.com/sodabrew/igbinary.git
7171
pushd igbinary
72+
git checkout php-8
7273
phpize
7374
./configure
7475
make

php_memcached_session.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ PS_READ_FUNC(memcached)
445445
*val = ZSTR_EMPTY_ALLOC();
446446
return SUCCESS;
447447
} else {
448-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "error getting session from memcached: %s", memcached_last_error_message(memc));
448+
php_error_docref(NULL, E_WARNING, "error getting session from memcached: %s", memcached_last_error_message(memc));
449449
return FAILURE;
450450
}
451451
}
@@ -475,7 +475,7 @@ PS_WRITE_FUNC(memcached)
475475
if (memcached_set(memc, key->val, key->len, val->val, val->len, expiration, 0) == MEMCACHED_SUCCESS) {
476476
return SUCCESS;
477477
} else {
478-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "error saving session to memcached: %s", memcached_last_error_message(memc));
478+
php_error_docref(NULL, E_WARNING, "error saving session to memcached: %s", memcached_last_error_message(memc));
479479
}
480480
} while (--retries > 0);
481481

0 commit comments

Comments
 (0)