diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-06-13 17:17:57 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-06-13 17:17:57 +0300 |
| commit | ef4b2fc283ddaf9bd692015f1db6dad52171c3ce (patch) | |
| tree | d67458e007612a9ac71ccdf83bf168fd426012b2 /main/php.h | |
| parent | 02778731b75562edd3ecdd0f75298668afeb163a (diff) | |
| parent | 362d2e42a02fe018a7d1261a53ff59b73fed91f6 (diff) | |
| download | php-git-ef4b2fc283ddaf9bd692015f1db6dad52171c3ce.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php.h b/main/php.h index 7b1a9256ba..e14d6258d2 100644 --- a/main/php.h +++ b/main/php.h @@ -47,7 +47,7 @@ #elif defined(BSD) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) # define PHP_OS_FAMILY "BSD" #elif defined(__APPLE__) || defined(__MACH__) -# define PHP_OS_FAMILY "OSX" +# define PHP_OS_FAMILY "Mac" #elif defined(__sun__) # define PHP_OS_FAMILY "Solaris" #elif defined(__linux__) |