[Libreoffice-commits] .: 2 commits - basebmp/test basegfx/test o3tl/qa sax/qa vcl/source

[Caolán McNamara]

 basebmp/test/makefile.mk       |    7 -------
 basegfx/test/makefile.mk       |    7 -------
 o3tl/qa/makefile.mk            |    7 -------
 sax/qa/cppunit/makefile.mk     |    7 -------
 vcl/source/window/syschild.cxx |    2 ++
 5 files changed, 2 insertions(+), 28 deletions(-)

New commits:
commit 74e964949bac27f3db19bc226c22035fcad8f992
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 5 14:17:23 2011 +0100

    WaE: unused variable under some ifdefs

diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 27b9adb..bb9d550 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -251,9 +251,11 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
 
 #if defined WNT
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
+    (void)bUseJava;
 #elif defined QUARTZ
     // FIXME: this is wrong
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
+    (void)bUseJava;
 #elif defined UNX
     if( !bUseJava )
     {
commit e7e1bbeeca390066bc0a212c215b3c22d394c92f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 5 11:54:35 2011 +0100

    remove ADAPT_EXT_STL

diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 4fdc39b..cdb4cce 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -60,13 +60,6 @@ CDEFS+=-xalias_level=compatible
 .ENDIF
 .ENDIF
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- Common ----------------------------------------------------------
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 09d8b80..2c0f30c 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- Common ----------------------------------------------------------
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 0c6ecd8..3475aee 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 .IF "$(L10N_framework)"==""
diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk
index b28f0cb..e06eca2 100644
--- a/sax/qa/cppunit/makefile.mk
+++ b/sax/qa/cppunit/makefile.mk
@@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files