From fc9e0ee821a57cb504659da300901dbe68447b8f Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Mon, 20 Jun 2011 22:45:09 +0300
Subject: Don't use the i prefix for import libraries with WNTGCC

---
 sax/source/expatwrap/makefile.mk  | 4 ++++
 sax/source/fastparser/makefile.mk | 4 ++++
 sax/source/tools/makefile.mk      | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'sax/source')

diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk
index 6e1348c0d403..a0f177178004 100644
--- a/sax/source/expatwrap/makefile.mk
+++ b/sax/source/expatwrap/makefile.mk
@@ -54,7 +54,11 @@ SLOFILES =\
         $(SLO)$/saxwriter.obj
 
 SHL1TARGET= $(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)
+.ENDIF
 
 SHL1STDLIBS= \
         $(SALLIB)  \
diff --git a/sax/source/fastparser/makefile.mk b/sax/source/fastparser/makefile.mk
index d8f9378c19b9..9690ffab326e 100644
--- a/sax/source/fastparser/makefile.mk
+++ b/sax/source/fastparser/makefile.mk
@@ -51,7 +51,11 @@ SLOFILES =\
         $(SLO)$/xml2utf.obj
 
 SHL1TARGET= $(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)
+.ENDIF
 
 SHL1STDLIBS= \
         $(SALLIB)  \
diff --git a/sax/source/tools/makefile.mk b/sax/source/tools/makefile.mk
index 5923fc5a7785..abece06312ba 100644
--- a/sax/source/tools/makefile.mk
+++ b/sax/source/tools/makefile.mk
@@ -45,7 +45,11 @@ SLOFILES =	\
         $(SLO)$/fshelper.obj
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)$(DLLPOSTFIX)
+.ENDIF
 
 SHL1STDLIBS= \
                 $(CPPULIB)		\
-- 
cgit 


From 22f299b12e1c874a43b38f7efdda0d1b952d09a0 Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Sun, 3 Jul 2011 17:43:02 +0200
Subject: Remove component_getImplementationEnvironment methods

---
 sax/source/expatwrap/sax_expat.cxx | 6 ------
 sax/source/fastparser/facreg.cxx   | 6 ------
 2 files changed, 12 deletions(-)

(limited to 'sax/source')

diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 06258510ceca..34df91a83a26 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -1029,12 +1029,6 @@ using namespace sax_expatwrap;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx
index e4152cfc1b58..8352b0cf4824 100644
--- a/sax/source/fastparser/facreg.cxx
+++ b/sax/source/fastparser/facreg.cxx
@@ -35,12 +35,6 @@ Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance( const Referen
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
-- 
cgit