summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-04-14 09:55:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-04-14 09:55:15 +0000
commit25fc078264d431ed842996fb99a552bb1f19dd26 (patch)
tree55e05495cd6f64ddabc1243e29eb133ff1f2acc2
parent4a8f0892aea1203a0d773ee29af1b8edbea1537c (diff)
downloadATCD-25fc078264d431ed842996fb99a552bb1f19dd26.tar.gz
Mon Apr 14 09:54:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/tests/tests.mpc3
2 files changed, 9 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 554ab40e565..91fd426d4ce 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 14 09:54:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/tests.mpc:
+ Don't build 2980 with wchar enabled and added empty resource
+ file section
+
Mon Apr 14 08:59:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Threading_Helper_T.cpp:
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index e300e5e06dd..d6b29e879ab 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -261,11 +261,14 @@ project (Bug_2980_Regression_Test) {
// which loads an ACE-based DLL.
after += Bug_2980_Regression_Dll
+ avoids += uses_wchar
includes += $(ACE_ROOT)
exename = Bug_2980_Regression_Test
Source_Files {
Bug_2980_Regression_Test.cpp
}
+ Resource_Files {
+ }
}
project (Bug_2980_Regression_Dll): acelib {