Skip to content

Commit

Permalink
Merge branch 'master' of git.php.net:php-src
Browse files Browse the repository at this point in the history
* 'master' of git.php.net:php-src:
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY
  • Loading branch information
dstogov committed Jun 13, 2017
2 parents 0277873 + 362d2e4 commit ef4b2fc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion main/php.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down

0 comments on commit ef4b2fc

Please sign in to comment.