diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-01 12:12:00 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-01 12:12:00 +0000 |
| commit | b760fc716f957637bbf31ffe0eefeb34ac49ec76 (patch) | |
| tree | cacbcd6793d13fbd4e03c97350867ee952886157 /tests | |
| parent | 8a9f4bd62871f1ee270cc5258dda65a16e44a435 (diff) | |
| download | ATCD-b760fc716f957637bbf31ffe0eefeb34ac49ec76.tar.gz | |
ChangeLogTag: Thu Jun 1 11:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Dirent_Test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp index 19c6e554b41..6a91fa743c9 100644 --- a/tests/Dirent_Test.cpp +++ b/tests/Dirent_Test.cpp @@ -37,7 +37,7 @@ ACE_RCSID (tests, "$Id Dirent_Test.cpp,v 4.10 2003/05/18 19:17:34 dhinton Exp$") -#if defined (ACE_VXWORKS) || defined(CHORUS) +#if (defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)) || defined(CHORUS) #define TEST_DIR "log" #define DIR_DOT "." #define DIR_DOT_DOT ".." @@ -156,7 +156,7 @@ dirent_count (const ACE_TCHAR *dir_path, { #if !defined (ACE_LACKS_CHDIR) -# if defined (ACE_VXWORKS) +# if (defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)) // VxWorks only allows full paths (incl. device spec if applicable) to be specified ACE_TCHAR full_path[MAXPATHLEN]; if (ACE_OS::getcwd (full_path, sizeof(full_path)) == NULL) @@ -258,7 +258,7 @@ dirent_count (const ACE_TCHAR *dir_path, ++dir_count; #if !defined (ACE_LACKS_CHDIR) -# if defined (ACE_VXWORKS) +# if (defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)) // Move back to parent directory. if (ACE_OS::chdir (full_path) == -1) ACE_ERROR_RETURN ((LM_ERROR, |