summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-08-07 08:34:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-11-24 10:05:19 +0100
commit0516e495272c9aeff325d595e7f92e11c7ab8b47 (patch)
treed2b837bfbd47b18921751b8deee99320b796ab7c
parentUpdate config.{guess,sub} with latest versions and handle fallout of that (diff)
downloadcore-0516e495272c9aeff325d595e7f92e11c7ab8b47.tar.gz
core-0516e495272c9aeff325d595e7f92e11c7ab8b47.zip
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/+/106464 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/sal/alloca.h16
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