[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/prj sdext/source

[Damjan Jovanovic]

 sal/prj/build.lst                          |   21 ++++++++++-----------
 sdext/source/pdfimport/wrapper/wrapper.cxx |    4 ----
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 788b479fff17918d21d26f71ce33c4cea0835251
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Oct 12 17:51:16 2015 +0000

    Fix building with --enable-pdfimport on FreeBSD.
    
    Found-by: Don Lewis
    Patch-by: Don Lewis

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 2e35841..a826ab4 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -66,15 +66,11 @@
 
 #include <hash_map>
 #include <string.h>
-#ifdef WNT
 #include <stdlib.h>
 #include <ctype.h>
-#endif
 
 #include "rtl/bootstrap.h"
 
-#include <string.h> // memcmp
-
 #ifndef PDFI_IMPL_IDENTIFIER
 # error define implementation name for pdfi extension, please!
 #endif
commit e088c9f84cf06292b349e45b0e11d544f036ce9a
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Oct 12 17:13:21 2015 +0000

    Make all unit tests depend on sa_cpprt.u in case they also break the build.

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 02664fe..aae9858 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -14,14 +14,13 @@ sa	sal\qa                                  nmake   -   all sa_qa sa_util sa_cppr
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
 sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
-sa sal\qa\sal nmake - all sa_qa_sal sa_util  sa_cpprt.u NULL
-sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_util sa_cpprt.u NULL
-sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_util  sa_cpprt.u NULL
-
-sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_util NULL
-sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_util NULL
-sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_util NULL
-sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_util NULL
-sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_util NULL
-sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_util sa_cpprt.u NULL
-sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_util NULL
+sa	sal\qa\sal								nmake	-	all	sa_qa_sal sa_util  sa_cpprt.u NULL
+sa	sal\qa\osl\condition					nmake	-	all	sa_qa_osl_condition sa_util sa_cpprt.u NULL
+sa	sal\qa\osl\pipe							nmake	-	all	sa_qa_osl_pipe sa_util  sa_cpprt.u NULL
+sa	sal\qa\ByteSequence						nmake	-	all	sa_qa_ByteSequence sa_util sa_cpprt.u NULL
+sa	sal\qa\OStringBuffer					nmake	-	all	sa_qa_OStringBuffer sa_util sa_cpprt.u NULL
+sa	sal\qa\osl\mutex						nmake	-	all	sa_qa_osl_mutex sa_util sa_cpprt.u NULL
+sa	sal\qa\osl\profile						nmake	-	all	sa_qa_osl_profile sa_util sa_cpprt.u NULL
+sa	sal\qa\osl\setthreadname				nmake	-	all	sa_qa_osl_setthreadname sa_util sa_cpprt.u NULL
+sa	sal\qa\osl\thread						nmake	-	all	sa_qa_osl_thread sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\math							nmake	-	all	sa_qa_rtl_math sa_util sa_cpprt.u NULL
commit bc4f3c463865a98ef87e41e512c06f62e8a46100
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Oct 12 17:10:31 2015 +0000

    salcpprt doesn't always build before the qa_osl_thread unit test, causing the build to fail.
    
    Found-by: Don Lewis
    Patch-by: Don Lewis

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 4212078..02664fe 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -23,5 +23,5 @@ sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_util NULL
 sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_util NULL
 sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_util NULL
 sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_util NULL
-sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_util NULL
+sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_util sa_cpprt.u NULL
 sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_util NULL