[Libreoffice-commits] core.git: 2 commits - liblangtag/UnpackedTarball_langtag.mk sal/qa

[Caolán McNamara]

 liblangtag/UnpackedTarball_langtag.mk |    2 +-
 sal/qa/osl/file/osl_File.cxx          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dcde7d32a6a9b60b8642049a8dfb33d2b8bc7b92
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 8 10:31:08 2013 +0100

    no mkdtemp on AIX either
    
    Change-Id: I9103f86a5b8414c9cdf5fd3a2d662725343f0ed8

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index b4cd2ee..b84e708 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -5996,7 +5996,7 @@ namespace osl_Directory
             if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1))
                 tmp_x += rtl::OString('/');
 
-#if !defined(WNT) && !defined(ANDROID)
+#if !defined(WNT) && !defined(ANDROID) && !defined(AIX)
             // FIXME would be nice to create unique dir even on Windows
             tmp_x += rtl::OString("XXXXXX");
             char *out = mkdtemp(const_cast<char*>(tmp_x.getStr()));
commit 7df3ec713a72c3c21693587142ee31d0d93abf4a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 8 09:28:35 2013 +0100

    get liblangtag to build on AIX
    
    Change-Id: I770acf14cefbe53deea446df6e326d9fb5b52b04

diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk
index 4ad5f82..e7d37d5 100644
--- a/liblangtag/UnpackedTarball_langtag.mk
+++ b/liblangtag/UnpackedTarball_langtag.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
     # <https://github.com/tagoh/liblangtag/pull/8> "Use xmlDocCopyNode to merge
     #  nodes into different docs"
 
-ifeq ($(OS),MACOSX)
+ifeq ($(filter-out MACOSX AIX,$(OS)),)
 $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
 	liblangtag/liblangtag-0.4.0-mac.patch \
 	liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch \