File tree 5 files changed +10
-17
lines changed
5 files changed +10
-17
lines changed Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
58
58
- Removed checking and linking with obsolete libbind for some functions.
59
59
- Symbol HAVE_JSON has been removed (ext/json is always available since PHP
60
60
8.0).
61
+ - Symbol DARWIN has been removed (use __APPLE__ to target Darwin systems).
61
62
62
63
c. Windows build system changes
63
64
- Added Bison flag '-Wall' when generating lexer files as done in *nix build
Original file line number Diff line number Diff line change 227
227
228
228
AC_C_INLINE
229
229
230
- AC_MSG_CHECKING ( target system is Darwin )
231
- if echo "$target" | grep "darwin" > /dev/null; then
232
- AC_DEFINE ( [ DARWIN] , 1 , [ Define if the target system is darwin] )
233
- AC_MSG_RESULT ( yes )
234
- else
235
- AC_MSG_RESULT ( no )
236
- fi
237
-
238
230
dnl Test and set the alignment define for ZEND_MM. This also does the
239
231
dnl logarithmic test for ZEND_MM.
240
232
AC_MSG_CHECKING ( for MM alignment and log values )
Original file line number Diff line number Diff line change @@ -205,7 +205,7 @@ char *alloca();
205
205
# endif
206
206
#endif
207
207
208
- #if !ZEND_DEBUG && (defined(HAVE_ALLOCA) || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN )
208
+ #if !ZEND_DEBUG && (defined(HAVE_ALLOCA) || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(HPUX)) && !defined(__APPLE__ )
209
209
# define ZEND_ALLOCA_MAX_SIZE (32 * 1024 )
210
210
# define ALLOCA_FLAG (name ) \
211
211
bool name;
@@ -305,7 +305,7 @@ char *alloca();
305
305
# define ZEND_FASTCALL
306
306
#endif
307
307
308
- #if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN ) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)) || __has_attribute(noreturn)
308
+ #if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(__APPLE__ ) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)) || __has_attribute(noreturn)
309
309
# define HAVE_NORETURN
310
310
# define ZEND_NORETURN __attribute__ ((noreturn))
311
311
#elif defined(ZEND_WIN32)
@@ -321,7 +321,7 @@ char *alloca();
321
321
# define ZEND_STACK_ALIGNED
322
322
#endif
323
323
324
- #if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN ) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__))
324
+ #if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(__APPLE__ ) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__))
325
325
# define HAVE_NORETURN_ALIAS
326
326
# define HAVE_ATTRIBUTE_WEAK
327
327
#endif
Original file line number Diff line number Diff line change 40
40
#undef T_UNSPEC
41
41
#endif
42
42
#ifdef HAVE_ARPA_NAMESER_H
43
- #ifdef DARWIN
43
+ #ifdef __APPLE__
44
44
# define BIND_8_COMPAT 1
45
45
#endif
46
46
#include <arpa/nameser.h>
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ extern char** environ;
57
57
#include <machine/vmparam.h> /* for old BSD */
58
58
#include <sys/exec.h>
59
59
#endif
60
- #if defined(DARWIN )
60
+ #if defined(__APPLE__ )
61
61
#include <crt_externs.h>
62
62
#endif
63
63
@@ -91,9 +91,9 @@ extern char** environ;
91
91
#define PS_USE_PSTAT
92
92
#elif defined(HAVE_PS_STRINGS )
93
93
#define PS_USE_PS_STRINGS
94
- #elif defined(BSD ) && !defined(DARWIN )
94
+ #elif defined(BSD ) && !defined(__APPLE__ )
95
95
#define PS_USE_CHANGE_ARGV
96
- #elif defined(__linux__ ) || defined(_AIX ) || defined(__sgi ) || (defined(sun ) && !defined(BSD )) || defined(ultrix ) || defined(__osf__ ) || defined(DARWIN )
96
+ #elif defined(__linux__ ) || defined(_AIX ) || defined(__sgi ) || (defined(sun ) && !defined(BSD )) || defined(ultrix ) || defined(__osf__ ) || defined(__APPLE__ )
97
97
#define PS_USE_CLOBBER_ARGV
98
98
#elif defined(PHP_WIN32 )
99
99
#define PS_USE_WIN32
@@ -102,7 +102,7 @@ extern char** environ;
102
102
#endif
103
103
104
104
/* Different systems want the buffer padded differently */
105
- #if defined(_AIX ) || defined(__linux__ ) || defined(DARWIN )
105
+ #if defined(_AIX ) || defined(__linux__ ) || defined(__APPLE__ )
106
106
#define PS_PADDING '\0'
107
107
#else
108
108
#define PS_PADDING ' '
@@ -235,7 +235,7 @@ char** save_ps_args(int argc, char** argv)
235
235
}
236
236
new_argv [argc ] = NULL ;
237
237
238
- #if defined(DARWIN )
238
+ #if defined(__APPLE__ )
239
239
/*
240
240
* Darwin (and perhaps other NeXT-derived platforms?) has a static
241
241
* copy of the argv pointer, which we may fix like so:
You can’t perform that action at this time.
0 commit comments