From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 7 Apr 2019 13:57:21 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4a563b0c0f65ea26382f81ac24bf0a30baf257a;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove HAVE_SIGNAL_H
---

e4a563b0c0f65ea26382f81ac24bf0a30baf257a
diff --cc TSRM/TSRM.h
index c399e243c0,64661c1ebf..54b3ce1214
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@@ -62,14 -71,18 +62,12 @@@ typedef int ts_rsrc_id
  #ifdef TSRM_WIN32
  # define THREAD_T DWORD
  # define MUTEX_T CRITICAL_SECTION *
 -#elif defined(GNUPTH)
 -# define THREAD_T pth_t
 -# define MUTEX_T pth_mutex_t *
 -#elif defined(PTHREADS)
 +#else
  # define THREAD_T pthread_t
  # define MUTEX_T pthread_mutex_t *
 -#elif defined(TSRM_ST)
 -# define THREAD_T st_thread_t
 -# define MUTEX_T st_mutex_t
  #endif
  
- #ifdef HAVE_SIGNAL_H
  #include <signal.h>
- #endif
  
  typedef void (*ts_allocate_ctor)(void *);
  typedef void (*ts_allocate_dtor)(void *);