Skip to content

Commit c4a60c6

Browse files
committed
zend build making sigjmp_buf and api check as mandatory.
all unixes support it since long time, the few which don't do not meet the requirements to build php anyway (minix, dietlibc, ...).
1 parent 520787b commit c4a60c6

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

Zend/Zend.m4

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,16 @@ AC_CHECK_FUNCS(m4_normalize([
151151
pthread_stackseg_np
152152
]))
153153
154-
dnl Check for sigsetjmp. If it's defined as a macro, AC_CHECK_FUNCS won't work.
155-
AC_CHECK_FUNCS([sigsetjmp],,
156-
[AC_CHECK_DECL([sigsetjmp],
157-
[AC_DEFINE([HAVE_SIGSETJMP], [1])],,
158-
[#include <setjmp.h>])])
154+
dnl
155+
dnl ZEND_CHECK_SIGSETJMP
156+
dnl
157+
dnl Check for sigsetjmp. If sigsetjmp is defined as a macro, use AC_CHECK_DECL
158+
dnl as a fallback since AC_CHECK_FUNC cannot detect macros.
159+
dnl
160+
AC_CHECK_FUNC([sigsetjmp],,
161+
[AC_CHECK_DECL([sigsetjmp],,
162+
[AC_MSG_ERROR([Required sigsetjmp not found. Please, check config.log])],
163+
[#include <setjmp.h>])])
159164
160165
ZEND_CHECK_STACK_DIRECTION
161166
ZEND_CHECK_FLOAT_PRECISION

Zend/zend_portability.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ char *alloca();
394394
# define XtOffsetOf(s_type, field) offsetof(s_type, field)
395395
#endif
396396

397-
#ifdef HAVE_SIGSETJMP
397+
#ifndef ZEND_WIN32
398398
# define SETJMP(a) sigsetjmp(a, 0)
399399
# define LONGJMP(a,b) siglongjmp(a, b)
400400
# define JMP_BUF sigjmp_buf

0 commit comments

Comments
 (0)