ChangeLogTag:Thu Oct 27 01:59:19 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>

1 files changed, 20 insertions, 4 deletions

diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl
index 88085ddb84e..63cab76ce22 100644
--- a/ACE/ace/OS_NS_sys_stat.inl
+++ b/ACE/ace/OS_NS_sys_stat.inl
@@ -95,23 +95,39 @@ namespace ACE_OS
   // This function returns the number of bytes in the file referenced by
   // FD.
 
-  ACE_INLINE ACE_LOFF_T
+  ACE_INLINE ACE_OFF_T
   filesize (ACE_HANDLE handle)
   {
     ACE_OS_TRACE ("ACE_OS::filesize");
+#if defined (ACE_WIN32)
+# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+    LARGE_INTEGER size;
+    return
+      (::GetFileSizeEx (handle, &size)
+       ? size.QuadPart
+       : (ACE_OS::set_errno_to_last_error (), -1));
+# else
+    ACE_OFF_T const size = ::GetFileSize (handle, 0);
+    return
+      (size != INVALID_FILE_SIZE
+       ? size
+       : (ACE_OS::set_errno_to_last_error (), -1));
+# endif  /* _FILE_OFFSET_BITS == 64 */
+#else /* !ACE_WIN32 */
     ACE_stat sb;
     return ACE_OS::fstat (handle, &sb) == -1 ? -1 : sb.st_size;
+#endif
   }
 
-  ACE_INLINE ACE_LOFF_T
+  ACE_INLINE ACE_OFF_T
   filesize (const ACE_TCHAR *filename)
   {
     ACE_OS_TRACE ("ACE_OS::filesize");
 
-    ACE_HANDLE h = ACE_OS::open (filename, O_RDONLY);
+    ACE_HANDLE const h = ACE_OS::open (filename, O_RDONLY);
     if (h != ACE_INVALID_HANDLE)
       {
-        ACE_LOFF_T size = ACE_OS::filesize (h);
+        ACE_OFF_T size = ACE_OS::filesize (h);
         ACE_OS::close (h);
         return size;
       }