diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-29 21:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 21:25:46 +0100 |
| commit | 4d9b8a98ba1bdd2bc7d80f4ab61061c07298fd15 (patch) | |
| tree | 30800f17fcf1f229ce46a743320b5eb18177ba87 /thirdparty | |
| parent | e647342140d8eb960b2a72d83b4b86e43aef4fc7 (diff) | |
| parent | fe93bb03fec293e3ef38c9b01dc0b10c857c1d21 (diff) | |
Merge pull request #23279 from marcelofg55/osx_server
Server platform works on OS X too
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/libwebsockets/lws_config.h | 2 | ||||
| -rw-r--r-- | thirdparty/libwebsockets/lws_config_private.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/libwebsockets/lws_config.h b/thirdparty/libwebsockets/lws_config.h index e5e15cc2fd..86ce9ac38a 100644 --- a/thirdparty/libwebsockets/lws_config.h +++ b/thirdparty/libwebsockets/lws_config.h @@ -174,7 +174,7 @@ #define LWS_HAVE_MALLOC_H #endif -#if !defined(IPHONE_ENABLED) && !defined(OSX_ENABLED) && !defined(__HAIKU__) +#if !defined(__APPLE__) && !defined(__HAIKU__) #define LWS_HAVE_PIPE2 #endif diff --git a/thirdparty/libwebsockets/lws_config_private.h b/thirdparty/libwebsockets/lws_config_private.h index b26d225afa..e531777624 100644 --- a/thirdparty/libwebsockets/lws_config_private.h +++ b/thirdparty/libwebsockets/lws_config_private.h @@ -81,7 +81,7 @@ /* Define to 1 if you have the <sys/prctl.h> header file. */ #define LWS_HAVE_SYS_PRCTL_H -#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) #undef LWS_HAVE_SYS_PRCTL_H #endif |