From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 4 Jun 2019 14:14:46 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=623eedbbd5c48d816adb06a9a1b628117d1d9d27;p=php

Merge branch 'PHP-7.4'
---

623eedbbd5c48d816adb06a9a1b628117d1d9d27
diff --cc TSRM/TSRM.h
index 9a5940ea5f,3e3e7d656e..ed2dcc0d5a
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@@ -163,15 -185,16 +163,9 @@@ TSRM_API const char *tsrm_api_name(void
  #define TSRMG_FAST_BULK_STATIC(offset, type)	((type) (((char*) TSRMLS_CACHE)+(offset)))
  #define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
  #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
- #if ZEND_DEBUG
  #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
- #define TSRMLS_CACHE_RESET()
- #else
- #define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
- #define TSRMLS_CACHE_RESET()  TSRMLS_CACHE = NULL
- #endif
  #define TSRMLS_CACHE _tsrm_ls_cache
  
 -/* BC only */
 -#define TSRMLS_D void
 -#define TSRMLS_DC
 -#define TSRMLS_C
 -#define TSRMLS_CC
 -#define TSRMLS_FETCH()
 -
  #ifdef __cplusplus
  }
  #endif