[Libreoffice-commits] core.git: sal/CppunitTest_sal_rtl.mk sal/qa

[Jan Holesovsky]

 sal/CppunitTest_sal_rtl.mk     |    1 -
 sal/qa/rtl/alloc/rtl_alloc.cxx |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fadbccc3176044b3642716f5b388a793165da05a
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Dec 19 10:42:40 2017 +0100

    Don't use -I$(SRCDIR), people have various strange stuff in the SRCDIR.
    
    For me, the build failed because of a file named 'new' ;-)
    
    Change-Id: I1816ff16b1b76a833ded2b6f332553b768916cad
    Reviewed-on: https://gerrit.libreoffice.org/46776
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk
index c4629a2c33db..43533fc5ab1c 100644
--- a/sal/CppunitTest_sal_rtl.mk
+++ b/sal/CppunitTest_sal_rtl.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl,\
 
 $(eval $(call gb_CppunitTest_set_include,sal_rtl,\
 	-I$(SRCDIR)/sal/qa/inc \
-	-I$(SRCDIR) \
 	$$(INCLUDE) \
 ))
 
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 6a4c1648ff53..0e9b7c0f47a8 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -24,7 +24,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-#include <sal/rtl/strimp.hxx>
+#include "../../../rtl/strimp.hxx"
 
 #include <memory.h>