X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=php_pq.h;h=7d7f2679d6b1d7edcbcf93e6a237d504529e91c6;hp=64e8ba639b1c4c194e3798b84478f6d34d9c67e9;hb=refs%2Fheads%2Ffix-19;hpb=a5adaca46ac66d6aeed929d655d1ea707adfc4ee

diff --git a/php_pq.h b/php_pq.h
index 64e8ba6..7d7f267 100644
--- a/php_pq.h
+++ b/php_pq.h
@@ -14,27 +14,34 @@
 #ifndef PHP_PQ_H
 #define PHP_PQ_H
 
-#define PHP_PQ_EXT_VERSION "0.2.0"
-
-int pq_module_number;
-zend_module_entry pq_module_entry;
-#define phpext_pq_ptr &pq_module_entry
+#define PHP_PQ_VERSION "2.2.0dev"
 
 #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
 
+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 */