[Libreoffice-commits] core.git: include/LibreOfficeKit solenv/bin

[Gleb Popov (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKitInit.h |    2 +-
 solenv/bin/concat-deps.c                    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4e94fe97236e9dd169f00801980e369d67c6cda6
Author:     Gleb Popov <6yearold at gmail.com>
AuthorDate: Fri Oct 23 12:34:24 2020 +0400
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Oct 24 11:04:21 2020 +0200

    Fix remaining invalid usages of __FreeBSD_kernel__ define.
    
    Change-Id: Ib4b412353dc93434a5669fd92d220f64d9747fe8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104710
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index ff541fb2c113..8a48bd8392be 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -345,7 +345,7 @@ int lok_preinit( const char *install_path,  const char *user_profile_url )
 
 #undef SEPARATOR // It is used at least in enum class MenuItemType
 
-#endif // defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__)
+#endif // defined(__linux__) || defined (__FreeBSD__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__)
 
 #ifdef __cplusplus
 }
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 09416f103515..155328bf9360 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -32,7 +32,7 @@
 #define CORE_LITTLE_ENDIAN
 #endif /* Def _MSC_VER */
 
-#if defined(__linux) || defined(__FreeBSD_kernel__)
+#if defined(__linux) || defined(__FreeBSD__)
 #include <sys/param.h>
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #undef CORE_BIG_ENDIAN