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

Michael Stahl mstahl at redhat.com
Fri Jun 24 20:36:57 UTC 2016


 external/libzmf/0001-add-missing-include.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c931f3a5184928bc333796362a5616a93c6ed6d7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jun 24 22:33:28 2016 +0200

    libzmf: __ANDROID__, not ANDROID
    
    The former is defined by GCC, the latter by gbuild -D$(OS)
    
    Change-Id: I5960f8f74defcab964729c4deca5b1a988125d24

diff --git a/external/libzmf/0001-add-missing-include.patch.1 b/external/libzmf/0001-add-missing-include.patch.1
index c5ddfe9..ff1dc2a 100644
--- a/external/libzmf/0001-add-missing-include.patch.1
+++ b/external/libzmf/0001-add-missing-include.patch.1
@@ -18,7 +18,7 @@ index ded93c7..7e024b3 100644
  
 +#include <cmath>
 +
-+#if defined(ANDROID)
++#if defined(__ANDROID__)
 +namespace std
 +{
 +template<typename T>


More information about the Libreoffice-commits mailing list