Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations .diff with TC changes added
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// $Id: OS_NS_unistd.cpp 91286 2010-08-05 09:04:31Z johnnyw $
|
||||
// $Id: OS_NS_unistd.cpp 94448 2011-09-08 08:20:29Z johnnyw $
|
||||
|
||||
#include "ace/OS_NS_unistd.h"
|
||||
|
||||
@@ -22,22 +22,6 @@
|
||||
# include "cpuset.h"
|
||||
#endif /* ACE_HAS_VXCPULIB */
|
||||
|
||||
#if defined (ACE_NEEDS_FTRUNCATE)
|
||||
extern "C" int
|
||||
ftruncate (ACE_HANDLE handle, long len)
|
||||
{
|
||||
struct flock fl;
|
||||
fl.l_whence = 0;
|
||||
fl.l_len = 0;
|
||||
fl.l_start = len;
|
||||
fl.l_type = F_WRLCK;
|
||||
|
||||
return ACE_OS::fcntl (handle, F_FREESP, reinterpret_cast <long> (&fl));
|
||||
}
|
||||
#endif /* ACE_NEEDS_FTRUNCATE */
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
int
|
||||
@@ -723,8 +707,11 @@ ACE_OS::pwrite (ACE_HANDLE handle,
|
||||
return (ssize_t) bytes_written;
|
||||
|
||||
# else /* ACE_WIN32 */
|
||||
|
||||
# if defined (ACE_HAS_NON_CONST_PWRITE)
|
||||
return ::pwrite (handle, const_cast<void*> (buf), nbytes, offset);
|
||||
# else
|
||||
return ::pwrite (handle, buf, nbytes, offset);
|
||||
# endif
|
||||
# endif /* ACE_WIN32 */
|
||||
# else /* ACE_HAS_P_READ_WRITE */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user