diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-08-07 08:34:42 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-11-15 10:40:15 +0100 |
| commit | ce8291f5c9cf3742766d5d32e146dbbea7b5c3bc (patch) | |
| tree | 46804a66fc8f3615f3bc0577a27e5d5a93c10ef3 | |
| parent | c0ee423b8580a361086f8018ece611ce0b7fe00b (diff) | |
Use <alloca.h> for macOS and iOS, too
Change-Id: I20f349cc03fe28536470c19f2559cc5414b823fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100284
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105879
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | include/sal/alloca.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/sal/alloca.h b/include/sal/alloca.h index 70a3f9c9d563..801a7b35e034 100644 --- a/include/sal/alloca.h +++ b/include/sal/alloca.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_ALLOCA_H #define INCLUDED_SAL_ALLOCA_H -#if defined (__sun) || defined (LINUX) || defined(AIX) || defined(ANDROID) || defined(HAIKU) +#if defined (__sun) || defined (LINUX) || defined(AIX) || defined(ANDROID) || defined(HAIKU) || defined(MACOSX) || defined(IOS) #ifndef INCLUDED_ALLOCA_H #include <alloca.h> @@ -34,20 +34,6 @@ #define INCLUDED_STDLIB_H #endif -#elif defined (MACOSX) - -#ifndef INCLUDED_SYS_TYPES_H -#include <sys/types.h> -#define INCLUDED_SYS_TYPES_H -#endif - -#elif defined (IOS) - -#ifndef INCLUDED_SYS_TYPES_H -#include <sys/types.h> -#define INCLUDED_SYS_TYPES_H -#endif - #elif defined (_WIN32) #ifndef INCLUDED_MALLOC_H |