diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-12 10:55:08 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-12 10:55:08 +0200 |
| commit | cd78967d03c2665896ddf2b4c52a8f06676138c8 (patch) | |
| tree | 634e261b539e7d0dac757b7176171f48f8e19341 /scp2/source/ooo/ure.scp | |
| parent | f74e372ac65f8f8337b5723b7629daa4d3f14371 (diff) | |
Remove remaining M1500 and M1600 usage.
Use _MSC_VER instead. This macro is already defined by the compiler, no
need to do it twice.
Since mergemodules_ooo.scp is no longer used, we can simply remove it.
Diffstat (limited to 'scp2/source/ooo/ure.scp')
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 36fbd06743d8..6d61daff3df0 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -868,7 +868,7 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); #endif #endif -#elif defined WNT && (defined(M1500) || defined (M1600) ) +#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600)) #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); #else |