[Libreoffice-commits] core.git: bridges/source sw/source

[Herbert Dürr]

 bridges/source/cpp_uno/msvc_win32_intel/except.cxx |    1 -
 sw/source/core/text/portxt.hxx                     |    6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit ec2512209d8fbf640749ab9f18b2232ac9cbf060
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Mar 5 09:37:22 2013 +0000

    the header file new.h is obsolete on our platforms
    
    (cherry picked from commit 94e277e997d396ae44e4c13c806fa0f461dafd83)
    
    Conflicts:
    	sw/source/core/text/portxt.hxx
    
    Change-Id: Ia785878f2b96704fcf858599afba2535b53d6b6f

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index c6345e2..b2c97ba 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -22,7 +22,6 @@
 #include <boost/unordered_map.hpp>
 #include <sal/config.h>
 #include <malloc.h>
-#include <new.h>
 #include <typeinfo.h>
 #include <signal.h>
 
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 97d4ff4..d201c74 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -18,11 +18,7 @@
  */
 #ifndef _PORTXT_HXX
 #define _PORTXT_HXX
-#ifdef __GNUC__
-#include <sys/types.h>
-#else
-#include <new.h>    // for size_t, FIXEDMEM from tools
-#endif
+
 #include <tools/mempool.hxx>
 
 #include "porlin.hxx"