From cd5137b3e7cb8fe55a32b1de626127e786a86d0d Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sun, 4 Feb 2007 15:32:00 +0000 Subject: [PATCH 1/1] - simplify --- php_http_request_datashare_api.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/php_http_request_datashare_api.h b/php_http_request_datashare_api.h index 8199137..07bb999 100644 --- a/php_http_request_datashare_api.h +++ b/php_http_request_datashare_api.h @@ -21,21 +21,21 @@ typedef struct _http_request_datashare_lock_t { CURL *ch; MUTEX_T mx; } http_request_datashare_lock; + +typedef union _http_request_datashare_handle_t { + zend_llist *list; + http_request_datashare_lock *locks; +} http_request_datashare_handle; +#else +typedef struct _http_request_datashare_handle_t { + zend_llist *list; +} http_request_datashare_handle; #endif typedef struct _http_request_datashare_t { CURLSH *ch; zend_bool persistent; -#ifdef ZTS - union { - zend_llist *list; - http_request_datashare_lock *locks; - } handle; -#else - struct { - zend_llist *list; - } handle; -#endif + http_request_datashare_handle handle; } http_request_datashare; #define HTTP_RSHARE_HANDLES(s) ((s)->persistent ? &HTTP_G->request.datashare.handles : (s)->handle.list) -- 2.30.2