Skip to content

Commit ca62a99

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Haiku fix ZTS build, disabling tls model
2 parents ca0afc3 + 188a6cc commit ca62a99

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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)