Merge remote-tracking branch 'origin/true-async-api' into true-async-api

Author: EdmondDantes

Zend/zend_async_API.c

@@ -21,7 +21,7 @@ int zend_async_globals_id = 0;
 size_t zend_async_globals_offset = 0;
 #else
 // The default data structure that is used when no other extensions are present.
-zend_async_globals_t zend_async_globals = {0};
+zend_async_globals_t zend_async_globals_api = {0};
 #endif
 
 #define ASYNC_THROW_ERROR(error) zend_throw_error(NULL, error);
@@ -147,7 +147,7 @@ void zend_async_globals_ctor(void)
 	ZEND_ASSERT(zend_async_globals_id != 0 && "zend_async_globals allocation failed");
 
 #else
-	ts_globals_ctor(zend_async_globals);
+	ts_globals_ctor(&zend_async_globals_api);
 #endif
 }
 
@@ -159,7 +159,7 @@ void zend_async_globals_dtor(void)
 {
 #ifdef ZTS
 #else
-	ts_globals_dtor(zend_async_globals);
+	ts_globals_dtor(&zend_async_globals_api);
 #endif
 }
 

Zend/zend_async_API.h

@@ -829,8 +829,8 @@ ZEND_API extern int zend_async_globals_id;
 ZEND_API extern size_t zend_async_globals_offset;
 #define ZEND_ASYNC_G(v) ZEND_TSRMG_FAST(zend_async_globals_offset, zend_async_globals_t *, v)
 #else
-#define ZEND_ASYNC_G(v) (zend_async_globals.v)
-ZEND_API extern zend_async_globals_t zend_async_globals;
+#define ZEND_ASYNC_G(v) (zend_async_globals_api.v)
+ZEND_API extern zend_async_globals_t zend_async_globals_api;
 #endif
 END_EXTERN_C()