X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=php_pq.h;h=06a0da20786e77d078d409a358b25f393b178ddb;hp=fc67bf0d132ecaf31c817327b825b6805afdcaf2;hb=6332e6d158454bbcb884e61ae493f85f2c289ea9;hpb=daf2e8ab5eb324b0a0447e87a92afb6788a722a7 diff --git a/php_pq.h b/php_pq.h index fc67bf0..06a0da2 100644 --- a/php_pq.h +++ b/php_pq.h @@ -14,36 +14,29 @@ #ifndef PHP_PQ_H #define PHP_PQ_H -#define PHP_PQ_EXT_VERSION "1.0.0dev" - -int pq_module_number; -zend_module_entry pq_module_entry; -#define phpext_pq_ptr &pq_module_entry +#define PHP_PQ_VERSION "1.1.1" #ifdef PHP_WIN32 # define PHP_PQ_API __declspec(dllexport) #elif defined(__GNUC__) && __GNUC__ >= 4 -# define PHP_PQ_API __attribute__ ((visibility("default"))) +# define PHP_PQ_API extern __attribute__ ((visibility("default"))) #else -# define PHP_PQ_API +# define PHP_PQ_API extern #endif -#ifdef ZTS -# include "TSRM.h" -#endif +extern int pq_module_number; +extern zend_module_entry pq_module_entry; +#define phpext_pq_ptr &pq_module_entry -/* -ZEND_BEGIN_MODULE_GLOBALS(pq) - long global_value; - char *global_string; -ZEND_END_MODULE_GLOBALS(pq) #ifdef ZTS -#define PQ_G(v) TSRMG(pq_globals_id, zend_pq_globals *, v) +# include "TSRM.h" +# define TSRMLS_DF(d) TSRMLS_D = (d)->ts +# define TSRMLS_CF(d) (d)->ts = TSRMLS_C #else -#define PQ_G(v) (pq_globals.v) +# define TSRMLS_DF(d) +# define TSRMLS_CF(d) #endif -*/ #endif /* PHP_PQ_H */