Skip to content

Commit 970c027

Browse files
committed
Fix merge
1 parent 50e38ac commit 970c027

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

‎Zend/zend_types.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include "zend_portability.h"
2525
#include "zend_long.h"
26-
#include "zend_atomic.h"
2726
#include <stdbool.h>
2827
#include <stdint.h>
2928

@@ -961,17 +960,6 @@ static zend_always_inline uint32_t zend_gc_delref_ex(zend_refcounted_h *p, uint3
961960

962961
#define OBJ_EXTRA_FLAGS(obj) ((obj)->extra_flags)
963962

964-
static zend_always_inline uint32_t zend_atomic_load_acquire_32(const uint32_t *ptr)
965-
{
966-
#if defined(__GNUC__) || defined(__clang__) || defined(HAVE_GNUC_ATOMICS)
967-
return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
968-
#else
969-
uint32_t val = *(const volatile uint32_t *)ptr;
970-
ZEND_ATOMIC_FENCE_ACQUIRE();
971-
return val;
972-
#endif
973-
}
974-
975963
/* Fast class cache */
976964
static zend_always_inline bool zstr_has_ce_cache(const zend_string *s)
977965
{

0 commit comments

Comments
 (0)