include/sal/alloca.h | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
New commits:
commit ce8291f5c9cf3742766d5d32e146dbbea7b5c3bc
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Aug 7 08:34:42 2020 +0100
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sun Nov 15 10:40:15 2020 +0100
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 <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105879
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
