diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
| commit | 4df04cc27ef1e77bcc941afaba7d4c943b98a936 (patch) | |
| tree | 5054c2bde24d048d4790ff659b61be0838cd0d69 /ACE/ace/ACE.cpp | |
| parent | b723802f85ac66026a503827677a2fb1e9a77933 (diff) | |
| download | ATCD-4df04cc27ef1e77bcc941afaba7d4c943b98a936.tar.gz | |
Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'ACE/ace/ACE.cpp')
| -rw-r--r-- | ACE/ace/ACE.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 952e83b9bed..f868f6dea1a 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -25,10 +25,6 @@ #include "ace/OS_TLI.h" #include "ace/Truncate.h" -#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620) -extern "C" int maxFiles; -#endif /* ACE_VXWORKS */ - #if !defined (__ACE_INLINE__) #include "ace/ACE.inl" #endif /* __ACE_INLINE__ */ @@ -2811,8 +2807,6 @@ ACE::max_handles (void) #if defined (_SC_OPEN_MAX) return ACE_OS::sysconf (_SC_OPEN_MAX); -#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620) - return maxFiles; #elif defined (FD_SETSIZE) return FD_SETSIZE; #else |