summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-03-19 08:01:10 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-03-19 08:01:10 +0000
commit0628ae415511c024e3f81d78439567da1ab7accc (patch)
tree48b6bdb47719315b4bb496a214121c84964bfb32
parent4fe14ad59676ee0cd6f54bbd38d714cce3da558e (diff)
downloadATCD-0628ae415511c024e3f81d78439567da1ab7accc.tar.gz
Mon Mar 19 07:53:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb16
2 files changed, 9 insertions, 13 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 3fa20483435..cdc0512fe25 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 19 07:53:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/MakeProjectCreator/config/vc8_warnings.mpb:
+ Made vc8 and nmake more the same so that also with nmake the
+ crt warnings are suppressed
+
Sun Mar 18 02:09:31 UTC 2007 Krishnakumar B <kitty@nospam.invalid.domain>
* ace/OS_NS_stdlib.cpp: Fixed a race condition in
diff --git a/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb b/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
index f416d0973ab..46c2b0c65fe 100644
--- a/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
+++ b/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
@@ -10,25 +10,15 @@
feature(vc8_avoid_crt_secure_warnings) {
- specific(vc8) {
- macros += _CRT_SECURE_NO_WARNINGS
- }
-
- // VC8 builds via nmake don't respect _CRT_NONSTDC_NO_WARNINGS that the
- // IDE build does so disable it with /wd4996. It's a very large hammer,
- // but nmake seems to leave little choice.
- specific(nmake) {
- compile_flags += /wd4996 /D _CRT_SECURE_NO_DEPRECATE
+ specific(vc8, nmake) {
+ macros += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE
}
}
feature(!vc8_scl_secure_warnings) {
- specific(vc8) {
+ specific(vc8, nmake) {
macros += _SCL_SECURE_NO_WARNINGS
}
- specific(nmake) {
- compile_flags += /D _SCL_SECURE_NO_WARNINGS
- }
}
feature(vc8_avoid_this_in_initializer_warnings) {