File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -234,6 +234,14 @@ case $host_alias in
234
234
;;
235
235
esac
236
236
237
+ dnl to disable executable stack on haiku due
238
+ dnl to missing elf .note.GNU-stack part
239
+ case $host_alias in
240
+ *haiku*)
241
+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
242
+ ;;
243
+ esac
244
+
237
245
dnl Detect musl libc
238
246
AC_MSG_CHECKING ( [ whether we are using musl libc] )
239
247
if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
Original file line number Diff line number Diff line change @@ -109,7 +109,9 @@ ZEND_DECLARE_MODULE_GLOBALS(sockets)
109
109
} \
110
110
} while (0)
111
111
#else
112
- #define PHP_ETH_PROTO_CHECK (protocol , family ) (0)
112
+ #define PHP_ETH_PROTO_CHECK (protocol , family ) \
113
+ (void)protocol; \
114
+ (void)family
113
115
#endif
114
116
115
117
static PHP_GINIT_FUNCTION (sockets );
You can’t perform that action at this time.
0 commit comments