cvs: php4 /ext/curl interface.c TSRM TSRM.h

From: Date: Mon, 28 Apr 2003 10:40:28 +0000
Subject: cvs: php4 /ext/curl interface.c TSRM TSRM.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-20533@lists.php.net to get a copy of this message
derick Mon Apr 28 06:40:28 2003 EDT Modified files: /TSRM TSRM.h /php4/ext/curl interface.c Log: - Fix non-ZTS build after Sterling's changes to TSRM Index: TSRM/TSRM.h diff -u TSRM/TSRM.h:1.39 TSRM/TSRM.h:1.40 --- TSRM/TSRM.h:1.39 Sun Apr 27 17:57:07 2003 +++ TSRM/TSRM.h Mon Apr 28 06:40:28 2003 @@ -149,7 +149,8 @@ #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 @@ #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 Index: php4/ext/curl/interface.c diff -u php4/ext/curl/interface.c:1.13 php4/ext/curl/interface.c:1.14 --- php4/ext/curl/interface.c:1.13 Sun Apr 27 18:15:19 2003 +++ php4/ext/curl/interface.c Mon Apr 28 06:40:28 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.13 2003/04/27 22:15:19 sterling Exp $ */ +/* $Id: interface.c,v 1.14 2003/04/28 10:40:28 derick Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -661,7 +661,7 @@ } alloc_curl_handle(&ch); - ch->thread_ctx = TSRMLS_C; + TSRMLS_SET_CTX(ch->thread_ctx); ch->cp = curl_easy_init(); if (!ch->cp) {

« previous php.cvs (#20533) next »