include/sal/main.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 1928ced074260d2d40345bdf4c96767abb99bb4f
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Aug 30 17:55:23 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Aug 30 19:29:29 2019 +0200
Blind fix for Android
tb24 started to fail with
> In file included from
/home/android/lo/master-android-arm/desktop/source/app/sofficemain.cxx:35:
> /home/android/lo/master-android-arm/include/sal/main.h:48:2: error: No
code that includes this should be built for iOS or Android
> #error No code that includes this should be built for iOS or Android
> ^
after 28c39b3d13485ae27a8b03d78fa208a443a50298 "Replace is_soffice_Impl hack
with a better(?) hack".
Change-Id: I586a666ff2b822cb49c271378e9bed26c7eb5640
Reviewed-on: https://gerrit.libreoffice.org/78314
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/sal/main.h b/include/sal/main.h
index d8a87c3e7f61..5b54ea40d1de 100644
--- a/include/sal/main.h
+++ b/include/sal/main.h
@@ -43,11 +43,8 @@ namespace sal::detail { constexpr int InitializeSoffice =
-1; }
SAL_DLLPUBLIC void SAL_CALL sal_detail_initialize(int argc, char ** argv);
SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize(void);
-#if defined IOS || defined ANDROID
-
-#error No code that includes this should be built for iOS or Android
-
-#else
+#if !(defined IOS || defined ANDROID)
+ /* No code that uses this should be built for iOS or Android */
#define SAL_MAIN_WITH_ARGS_IMPL \
int SAL_DLLPUBLIC_EXPORT SAL_CALL main(int argc, char ** argv) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
