prepare release 2.1.5

[m6w6/ext-pq] / php_pq.h

diff --git a/php_pq.h b/php_pq.h
index e5c00837db1ae355e0046757543d847eadcb6c85..cacd6c61c54343bf45fa6110e55ece32a09d4226 100644 (file)
--- a/php_pq.h
+++ b/php_pq.h
@@ -14,11 +14,7 @@
 #ifndef PHP_PQ_H
 #define PHP_PQ_H
 
-#define PHP_PQ_VERSION "0.5.3dev"
-
-int pq_module_number;
-zend_module_entry pq_module_entry;
-#define phpext_pq_ptr &pq_module_entry
+#define PHP_PQ_VERSION "2.1.5"
 
 #ifdef PHP_WIN32
 #      define PHP_PQ_API __declspec(dllexport)
@@ -28,13 +24,24 @@ zend_module_entry pq_module_entry;
 #      define PHP_PQ_API extern
 #endif
 
+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 */