[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - tools/inc tools/source

[Tor Lillqvist]

 tools/inc/tools/postsys.h                  |    4 ----
 tools/inc/tools/presys.h                   |    1 -
 tools/source/fsys/wntmsc.cxx               |    4 +---
 tools/source/reversemap/bestreversemap.cxx |    3 +--
 4 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 8fb48eccb68d6c751c64aea2a86281b0dfe25c27
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 21:33:04 2011 +0200

    More WIN_FOO cleanup

diff --git a/tools/inc/tools/postsys.h b/tools/inc/tools/postsys.h
index 875974c..af4518e 100644
--- a/tools/inc/tools/postsys.h
+++ b/tools/inc/tools/postsys.h
@@ -34,10 +34,6 @@
 #undef PolyPolygon
 #undef Polygon
 #undef Rectangle
-#undef ULONG
-#undef sal_Bool
-#undef BYTE
-#undef BOOL
 #undef DELETE
 
 /* Hilfe-Ids umbenennen */
diff --git a/tools/inc/tools/presys.h b/tools/inc/tools/presys.h
index d720deb..91b70bf 100644
--- a/tools/inc/tools/presys.h
+++ b/tools/inc/tools/presys.h
@@ -33,7 +33,6 @@
 
 #if defined WNT
 
-#define ULONG        WIN_ULONG
 #define Rectangle    BLA_Rectangle
 #define Polygon      BLA_Polygon
 #define PolyPolygon  BLA_PolyPolygon
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 2ddea1c..babc17e 100755
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -567,9 +567,7 @@ FileStat::FileStat( const void *pInfo,      // struct dirent
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
 #endif
-#define ULONG WIN_ULONG
 #include <shlobj.h>
-#undef ULONG
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
@@ -608,7 +606,7 @@ HRESULT SHGetIDListFromPath( HWND hwndOwner, LPCTSTR pszPath, LPITEMIDLIST *ppid
     if ( FAILED(hResult) )
         return hResult;
 
-    WIN_ULONG chEaten = lstrlen( pszPath );
+    ULONG chEaten = lstrlen( pszPath );
     DWORD dwAttributes = FILE_ATTRIBUTE_DIRECTORY;
 
 #ifdef UNICODE
commit b69c7d15d3534c50a1becf7296ea54a920647e6c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 21:32:01 2011 +0200

    Just use a normal main(), no need for SAL crack here

diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx
index a4956c1..bd18d50 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -28,7 +28,6 @@
 
 #include "sal/config.h"
 #include "rtl/textcvt.h"
-#include "sal/main.h"
 
 #include <stdio.h>
 
@@ -77,7 +76,7 @@ struct Encoder
 };
 
 
-SAL_IMPLEMENT_MAIN()
+int main(int argc, char **argv)
 {
 #   define EXP(x) Encoder(x, #x)