diff options
-rw-r--r-- | ChangeLog-99b | 8 | ||||
-rw-r--r-- | tests/MM_Shared_Memory_Test.cpp | 2 | ||||
-rw-r--r-- | tests/Malloc_Test.cpp | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index f139b98a9a5..c9a8d14b5d7 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,11 @@ +Wed Oct 6 08:36:17 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tests/Malloc_Test.cpp: Don't run the Malloc_Test on LynxOS. + + * tests/MM_Shared_Memory_Test.cpp: Fixed the code so that it'll + compile correctly on platforms that lack fork(), such as + VxWorks. Thanks to David Levine for reporting this. + Tue Oct 5 16:17:57 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tests/MM_Shared_Memory_Test.cpp (spawn): Make sure to diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp index d8a8effa020..239ef8918ed 100644 --- a/tests/MM_Shared_Memory_Test.cpp +++ b/tests/MM_Shared_Memory_Test.cpp @@ -37,7 +37,7 @@ const int SHMSZ = 27; static TCHAR shm_key[] = ACE_TEMP_FILE_NAME ACE_TEXT ("XXXXXX"); #if defined (ACE_LACKS_FORK) -static ACE_Thread_Semaphore SYNCHRONIZER; +typedef ACE_Thread_Semaphore SYNCHRONIZER; #else typedef ACE_Process_Semaphore SYNCHRONIZER; #endif /* !defined (ACE_LACKS_FORK) */ diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp index ead1f26e7b6..19aa4f746e0 100644 --- a/tests/Malloc_Test.cpp +++ b/tests/Malloc_Test.cpp @@ -29,7 +29,7 @@ USELIB("..\ace\aced.lib"); //--------------------------------------------------------------------------- #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ -#if !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) +#if !defined (__Lynx__) || !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; @@ -288,4 +288,4 @@ main (int, ASYS_TCHAR *[]) ACE_END_TEST; return 0; } -#endif /* !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) */ +#endif /* !defined (__Lynx__) || !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) */ |