From: Derick Rethans <derick@php.net>
Date: Mon, 28 Apr 2003 10:40:28 +0000 (+0000)
Subject: - Fix non-ZTS build after Sterling's changes to TSRM
X-Git-Tag: SPL_ALPHA~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=810ac117f0322d0c7954194462d890cdee915446;p=php

- Fix non-ZTS build after Sterling's changes to TSRM
---

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 888d5ff78b..09da7b49cb 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -149,7 +149,8 @@ TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread
 #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)
 
 #define TSRMLS_FETCH()			void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
-#define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx
+#define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
+#define TSRMLS_SET_CTX(ctx)		(void ***) ctx = tsrm_ls
 #define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
 #define TSRMLS_D	void ***tsrm_ls
 #define TSRMLS_DC	, TSRMLS_D
@@ -163,6 +164,8 @@ TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread
 #else /* non ZTS */
 
 #define TSRMLS_FETCH()
+#define TSRMLS_FETCH_FROM_CTX(ctx)
+#define TSRMLS_SET_CTX(ctx)
 #define TSRMLS_D	void
 #define TSRMLS_DC
 #define TSRMLS_C
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 53dc06f56f..5e36840858 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -661,7 +661,7 @@ PHP_FUNCTION(curl_init)
 	}
 
 	alloc_curl_handle(&ch);
-	ch->thread_ctx = TSRMLS_C;
+	TSRMLS_SET_CTX(ch->thread_ctx);
 	
 	ch->cp = curl_easy_init();
 	if (!ch->cp) {