summaryrefslogtreecommitdiff
path: root/TSRM/TSRM.h
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2003-04-28 10:40:28 +0000
committerDerick Rethans <derick@php.net>2003-04-28 10:40:28 +0000
commit810ac117f0322d0c7954194462d890cdee915446 (patch)
tree426c8283a0843410b82a9a89145b42746f34f58b /TSRM/TSRM.h
parent43e54bf2c1a6db999ff0b5bd8d5d621b6bb50b45 (diff)
downloadphp-git-810ac117f0322d0c7954194462d890cdee915446.tar.gz
- Fix non-ZTS build after Sterling's changes to TSRM
Diffstat (limited to 'TSRM/TSRM.h')
-rw-r--r--TSRM/TSRM.h5
1 files changed, 4 insertions, 1 deletions
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