X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=php_pq.h;h=be04b2bb05feb14cbc755d0c1e3a3d48611dbada;hp=d110e11ef37256ae5970ac0384e3f4c333490871;hb=c314bfb70b6d4f6574d8923bfd59e2bd42621a00;hpb=e81e9b91d06aa68bad42f623bc02111c250a6fbb diff --git a/php_pq.h b/php_pq.h index d110e11..be04b2b 100644 --- a/php_pq.h +++ b/php_pq.h @@ -14,7 +14,7 @@ #ifndef PHP_PQ_H #define PHP_PQ_H -#define PHP_PQ_VERSION "0.5.5" +#define PHP_PQ_VERSION "2.0.2dev" #ifdef PHP_WIN32 # define PHP_PQ_API __declspec(dllexport) @@ -28,14 +28,20 @@ extern int pq_module_number; extern zend_module_entry pq_module_entry; #define phpext_pq_ptr &pq_module_entry +ZEND_BEGIN_MODULE_GLOBALS(php_pq) + struct { + /* for ext-raphf */ + zend_string *name; + } connection; +ZEND_END_MODULE_GLOBALS(php_pq) + +ZEND_EXTERN_MODULE_GLOBALS(php_pq); #ifdef ZTS -# include "TSRM.h" -# define TSRMLS_DF(d) TSRMLS_D = (d)->ts -# define TSRMLS_CF(d) (d)->ts = TSRMLS_C +# include "TSRM/TSRM.h" +# define PHP_PQ_G ((zend_php_pq_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(php_pq_globals_id)]) #else -# define TSRMLS_DF(d) -# define TSRMLS_CF(d) +# define PHP_PQ_G (&php_pq_globals) #endif #endif /* PHP_PQ_H */