mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for _MSC_VER instead of MSC in sources

Browse Source 
Change-Id: Ibaf2501e6b655913963a53c1cd63668f1c4cccb2
This commit is contained in:
Tor Lillqvist
2012-12-27 13:07:11 +02:00
parent 90649a2078
commit c318f3b022
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/gbuild/platform/com_MSC_defs.mk
View File

@@ -50,7 +50,6 @@ gb_CXX := $(CXX)
endif endif
gb_COMPILERDEFS := \ gb_COMPILERDEFS := \
-DMSC \
-D_CRT_NON_CONFORMING_SWPRINTFS \ -D_CRT_NON_CONFORMING_SWPRINTFS \
-D_CRT_NONSTDC_NO_DEPRECATE \ -D_CRT_NONSTDC_NO_DEPRECATE \
-D_CRT_SECURE_NO_DEPRECATE \ -D_CRT_SECURE_NO_DEPRECATE \

2
svl/source/inc/poolio.hxx
View File

@@ -142,7 +142,7 @@ struct SfxItemPool_Impl
# undef DBG # undef DBG
#endif #endif
#if defined(DBG_UTIL) && defined(MSC) #if defined(DBG_UTIL) && defined(_MSC_VER)
#define DBG(x) x #define DBG(x) x
#else #else
#define DBG(x) #define DBG(x)

4
sw/source/filter/html/css1atr.cxx
View File

@@ -103,7 +103,9 @@ using ::editeng::SvxBorderLine;
* diese Section und die dazugeherigen Tabellen muessen in folgenden Files * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx * 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@iki.fi
#define ATTRFNTAB_SIZE 130 #define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

4
sw/source/filter/html/htmlatr.cxx
View File

@@ -86,7 +86,9 @@ using namespace ::com::sun::star;
* diese Section und die dazugeherigen Tabellen muessen in folgenden Files * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx * 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@iki.fi
#define ATTRFNTAB_SIZE 130 #define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

4
sw/source/filter/ww8/ww8atr.cxx
View File

@@ -140,7 +140,9 @@ using namespace nsSwDocInfoSubType;
* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx * 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@iki.fi
#define ATTRFNTAB_SIZE 130 #define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN

2
tools/source/fsys/dirent.cxx
View File

@@ -1337,7 +1337,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
* Welcome to the 21st century, we can have longer filenames now ;) * Welcome to the 21st century, we can have longer filenames now ;)
* New format: pfx + "5 char milli/micro second res" + "current pid" + ".tmp" * New format: pfx + "5 char milli/micro second res" + "current pid" + ".tmp"
*/ */
#if (defined MSC || defined __MINGW32__) && defined WNT #ifdef _WIN32
/* Milliseconds !! */ /* Milliseconds !! */
static unsigned long u = GetTickCount(); static unsigned long u = GetTickCount();
unsigned long mypid = static_cast<unsigned long>(_getpid()); unsigned long mypid = static_cast<unsigned long>(_getpid());