diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-09 11:42:07 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-09 11:42:07 +0000 |
| commit | 61ef3cf7e9878079b5206a216264b807d4a1955e (patch) | |
| tree | 4d94af04d00f0049c4daab2f85dc5047e19aab4b | |
| parent | 6c0fdb621afe24e04cf8ffdf2a4a04916f615e39 (diff) | |
| download | ATCD-61ef3cf7e9878079b5206a216264b807d4a1955e.tar.gz | |
Wed Apr 9 11:41:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/tests/Bug_2980_Regression_Test.cpp | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 597696060cb..8abc2f521e5 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 9 11:41:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_2980_Regression_Test.cpp: + Check for ACE_VXWORKS + Wed Apr 9 11:11:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Svc_Conf_y.cpp: diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp index 0cc4f5934a8..400452d4096 100644 --- a/ACE/tests/Bug_2980_Regression_Test.cpp +++ b/ACE/tests/Bug_2980_Regression_Test.cpp @@ -8,7 +8,7 @@ // platform-specific ones. Luckily, it is only Windows where this // test has not been made to work yet ... -#if !(defined (WIN32) || defined (VXWORKS)) +#if !(defined (WIN32) || defined (ACE_VXWORKS)) #include <dlfcn.h> #include <pthread.h> @@ -85,12 +85,12 @@ void * loadunloadDll(void *pp) return 0; } -#endif /* !(defined (WIN32) || defined (VXWORKS)) */ +#endif /* !(defined (WIN32) || defined (ACE_VXWORKS)) */ int main(int, char **) { -#if (defined (WIN32) || defined (VXWORKS)) +#if (defined (WIN32) || defined (ACE_VXWORKS)) printf ("Terminating because this test has not been designed " "to run on platforms where WIN32 has been defined.\n"); @@ -132,7 +132,7 @@ int main(int, char **) printf ("main - leaving\n"); -#endif /* (defined (WIN32) || defined (VXWORKS)) */ +#endif /* (defined (WIN32) || defined (ACE_VXWORKS)) */ return 0; } |