pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

php_ext fix zend_object_store_get_object call in php5.5

pull/170/head
yuqing 2017-10-16 10:57:19 +08:00
parent 7aac0aefa4
commit 429804107b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,7 +1,8 @@
Version 5.12 2017-08-10 Version 5.12 2017-10-16
* code refine for rare case * code refine for rare case
* replace print format OFF_PRINTF_FORMAT to PRId64 * replace print format OFF_PRINTF_FORMAT to PRId64
* php_ext fix zend_object_store_get_object call in php5.5
Version 5.11 2017-05-26 Version 5.11 2017-05-26
* bug fixed: file_offset has no effect when use trunk file * bug fixed: file_offset has no effect when use trunk file

2
php_client/fastdfs_client.c
View File

@ -53,7 +53,7 @@ typedef struct
#if PHP_MAJOR_VERSION < 7 #if PHP_MAJOR_VERSION < 7
#define fdfs_get_object(obj) zend_object_store_get_object(obj) #define fdfs_get_object(obj) zend_object_store_get_object(obj TSRMLS_CC)
#else #else
#define fdfs_get_object(obj) (void *)((char *)(Z_OBJ_P(obj)) - XtOffsetOf(php_fdfs_t, zo)) #define fdfs_get_object(obj) (void *)((char *)(Z_OBJ_P(obj)) - XtOffsetOf(php_fdfs_t, zo))
#endif #endif