[Libreoffice-commits] core.git: extensions/source

Stephan Bergmann sbergman at redhat.com
Tue Apr 8 23:55:09 PDT 2014


 extensions/source/plugin/unx/npwrap.cxx |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit 01f529b546b96e651c03ba9b0a92ec956d4813b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 9 08:49:05 2014 +0200

    Whatever those odd dummy function definitions were supposed to be good for
    
    ...introduced in d2237276cb3e32493ff8f9f71e06301937434622 "INTEGRATION: CWS
    vcl09 (1.6.10): #109426# make rpnp.so work on Linux" without any explanation,
    but probably a misguided attempt at getting things working in the face of a
    missing libgcc_s.so or libstdc++.so (though the names used here do not match any
    there), and seemingly not necessary.
    
    Change-Id: Ib092d426f4acfd3ece30adb754c1bb76d4eca381

diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 97b3f3f..afed65b 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -504,20 +504,4 @@ int main( int argc, char **argv)
     return 0;
 }
 
-#ifdef __GNUC__
-extern "C" {
-    void __pure_virtual()
-    {}
-
-    void* __builtin_new( int nBytes )
-    { return malloc(nBytes); }
-    void* __builtin_vec_new( int nBytes )
-    { return malloc(nBytes); }
-    void __builtin_delete( char* pMem )
-    { free(pMem); }
-    void __builtin_vec_delete( char* pMem )
-    { free(pMem); }
-}
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list