From f12505d5962153abc805e7c2fefbea8acca0d465 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Fri, 12 Nov 2010 16:21:07 +0100
Subject: Revert "Add workaround to avoid crash when exiting LibreOffice"

This reverts commit 146e2fbca20f5cba3410d3d042ae6222a565dd7e.

The workaround is has to be present in libreoffice-3-3, but we do not want to
have it in master, so that eventually it is fixed in the end :-)
---
 cppu/source/typelib/typelib.cxx | 2 --
 cppu/util/target.pmk            | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c248af3228e5..3cf9abe0934e 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -275,7 +275,6 @@ inline void TypeDescriptor_Init_Impl::callChain(
 //__________________________________________________________________________________________________
 TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
 {
-#ifndef CPPU_LEAK_STATIC_DATA
     if( pCache )
     {
         TypeDescriptionList_Impl::const_iterator aIt = pCache->begin();
@@ -355,7 +354,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
 #endif
     delete pCallbacks;
     pCallbacks = 0;
-#endif // CPPU_LEAK_STATIC_DATA
 
     if( pMutex )
     {
diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk
index 70be64b8e3f4..3befcb154753 100644
--- a/cppu/util/target.pmk
+++ b/cppu/util/target.pmk
@@ -45,16 +45,9 @@ CFLAGS += -O
 
 .ELSE
 
-.IF "$(COM)" == "MSC"
 # msvc++: no inlining
+.IF "$(COM)" == "MSC"
 CFLAGS += -Ob0
-.IF "$(cppu_no_leak)" == ""
-.IF "$(bndchk)" == ""
-# msvc++: workaround for strange crash at exit: just don't do the
-# cleanup of types and whatnot...
-CFLAGS += -DCPPU_LEAK_STATIC_DATA
-.ENDIF
-.ENDIF
 .ENDIF
 
 .ENDIF
-- 
cgit