From: Michael Wallner <mike@php.net>
Date: Sun, 4 Feb 2007 15:32:00 +0000 (+0000)
Subject: - simplify
X-Git-Tag: RELEASE_1_5_0_RC1~13
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=cd5137b3e7cb8fe55a32b1de626127e786a86d0d;hp=7bb02fe9ddb59cf972823009aeca5a3ab4df0634

- simplify
---

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)