[Libreoffice-commits] core.git: external/harfbuzz

[Jochen Nitschke]

 external/harfbuzz/ubsan.patch |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83a9c8e046dfcaccdb1114ec5a386a11fcca3a02
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Fri Dec 30 22:23:40 2016 +0000

    build fix
    
    apparently harfbuzz is not build with std=c++11 everywhere
    
    Change-Id: Ie105706212d9dd32f33bc67c8a878ce8a55e60ef
    Reviewed-on: https://gerrit.libreoffice.org/32521
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
index 36b5a45..fde85cf 100644
--- a/external/harfbuzz/ubsan.patch
+++ b/external/harfbuzz/ubsan.patch
@@ -58,7 +58,7 @@
    template <typename T>
    inline const Type *bsearch (T *key) const
    {
-+    if (len == 0) return nullptr;
++    if (len == 0) return NULL;
      return (const Type *) ::bsearch (key, array, len, sizeof (Type), (hb_compare_func_t) Type::cmp);
    }