Skip to content

Commit bea542a

Browse files
devnexencmb69
authored andcommitted
Haiku fix ZTS build, disabling tls model
Closes GH-8047.
1 parent 9bd468d commit bea542a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? 2022, PHP 8.0.17
44

5+
- Core:
6+
. Fixed Haiku ZTS build. (David Carlier)
7+
58
- Iconv:
69
. Fixed bug GH-7953 (ob_clean() only does not set Content-Encoding). (cmb)
710

TSRM/TSRM.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ TSRM_API const char *tsrm_api_name(void);
147147
# define __has_attribute(x) 0
148148
#endif
149149

150-
#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__)
150+
#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__)
151151
# define TSRM_TLS_MODEL_ATTR
152152
#elif __PIC__
153153
# define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))

0 commit comments

Comments
 (0)