[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit e58213ebfc60d639198ce86723878c6d948d8170
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 18 10:33:39 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 18 18:18:40 2020 +0100

    AC_CHECK_SIZEOF works fine when cross-compiling, no need to hard-code for iOS
    
    Possibly it didn't work when cross-compiling back when that
    hard-coding was added.
    
    Change-Id: I763d26ae1922907265636ba0be0757700bfe2a8b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106058
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 250f43054e17..abaceb94ee0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6625,22 +6625,12 @@ dnl ===================================================================
 
 if test "$_os" != "WINNT"; then
 
-if test "$_os" = "iOS"; then
-    AC_MSG_CHECKING([iOS setting sizes long, short, int, long long, double, voidp])
-    ac_cv_sizeof_long=8
-    ac_cv_sizeof_short=2
-    ac_cv_sizeof_int=4
-    ac_cv_sizeof_long_long=8
-    ac_cv_sizeof_double=8
-    ac_cv_sizeof_voidp=8
-else
     AC_CHECK_SIZEOF(long)
     AC_CHECK_SIZEOF(short)
     AC_CHECK_SIZEOF(int)
     AC_CHECK_SIZEOF(long long)
     AC_CHECK_SIZEOF(double)
     AC_CHECK_SIZEOF(void*)
-fi
 
     SAL_TYPES_SIZEOFSHORT=$ac_cv_sizeof_short
     SAL_TYPES_SIZEOFINT=$ac_cv_sizeof_int