[Libreoffice-commits] .: solenv/gbuild svl/source sw/source tools/source

[Libreoffice Gerrit user]

 solenv/gbuild/platform/com_MSC_defs.mk |    1 -
 svl/source/inc/poolio.hxx              |    2 +-
 sw/source/filter/html/css1atr.cxx      |    4 +++-
 sw/source/filter/html/htmlatr.cxx      |    4 +++-
 sw/source/filter/ww8/ww8atr.cxx        |    4 +++-
 tools/source/fsys/dirent.cxx           |    2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit c318f3b0224a57102614be0efec4b49c80a3aa82
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Dec 27 13:07:11 2012 +0200

    Check for _MSC_VER instead of MSC in sources
    
    Change-Id: Ibaf2501e6b655913963a53c1cd63668f1c4cccb2

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 1e9ac46..1e8004f 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -50,7 +50,6 @@ gb_CXX := $(CXX)
 endif
 
 gb_COMPILERDEFS := \
-	-DMSC \
 	-D_CRT_NON_CONFORMING_SWPRINTFS \
 	-D_CRT_NONSTDC_NO_DEPRECATE \
 	-D_CRT_SECURE_NO_DEPRECATE \
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index dd3e74a..13477eb 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -142,7 +142,7 @@ struct SfxItemPool_Impl
 #  undef DBG
 #endif
 
-#if defined(DBG_UTIL) && defined(MSC)
+#if defined(DBG_UTIL) && defined(_MSC_VER)
 #define DBG(x) x
 #else
 #define DBG(x)
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 46c1ddb..796ac3c 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -103,7 +103,9 @@ using ::editeng::SvxBorderLine;
  * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
  * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
  */
-#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(__MINGW32__)
+#if !defined(UNX) && !defined(_MSC_VER) && !defined(PPC) && !defined(__MINGW32__)
+
+#error Interesting, I though this ifdef block would never be compiled. So remove this line and please tell me --tml at iki.fi
 
 #define ATTRFNTAB_SIZE 130
 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 7bd1af6..d48202e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -86,7 +86,9 @@ using namespace ::com::sun::star;
  * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
  * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
  */
-#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(__MINGW32__)
+#if !defined(UNX) && !defined(_MSC_VER) && !defined(PPC) && !defined(__MINGW32__)
+
+#error Interesting, I though this ifdef block would never be compiled. So remove this line and please tell me --tml at iki.fi
 
 #define ATTRFNTAB_SIZE 130
 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b45ee1a..2c9c3e9 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -140,7 +140,9 @@ using namespace nsSwDocInfoSubType;
  * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
 */
 
-#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(__MINGW32__)
+#if !defined(_MSC_VER) && !defined(UNX) && !defined(PPC) && !defined(__MINGW32__)
+
+#error Interesting, I though this ifdef block would never be compiled. So remove this line and please tell me --tml at iki.fi
 
 #define ATTRFNTAB_SIZE 130
 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index cc0d3ff..1e9000b 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1337,7 +1337,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
              * Welcome to the 21st century, we can have longer filenames now ;)
              * New format: pfx + "5 char milli/micro second res" + "current pid" + ".tmp"
              */
-#if (defined MSC || defined __MINGW32__) && defined WNT
+#ifdef _WIN32
             /* Milliseconds !! */
             static unsigned long u = GetTickCount();
             unsigned long mypid = static_cast<unsigned long>(_getpid());