#ifndef PHP_PQ_H
#define PHP_PQ_H
-#define PHP_PQ_VERSION "0.5.1"
-
-int pq_module_number;
-zend_module_entry pq_module_entry;
-#define phpext_pq_ptr &pq_module_entry
+#define PHP_PQ_VERSION "2.1.0dev"
#ifdef PHP_WIN32
# define PHP_PQ_API __declspec(dllexport)
# 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 */