aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2018-02-07 12:00:00 +0100
committerRechi <Rechi@users.noreply.github.com>2018-02-07 12:00:00 +0100
commita3ff1169e76089e273913af0dd6d07578346c9bd (patch)
tree417f69eab9e718fa72e687721ef97e306402dd8e
parent839f4077b661b2a157907a57f9cd5db56da23ccf (diff)
[cleanup][PlatformDefs] remove ULONGLONG
-rw-r--r--xbmc/platform/linux/PlatformDefs.h3
-rw-r--r--xbmc/platform/linux/XFileUtils.cpp6
-rw-r--r--xbmc/platform/linux/XTimeUtils.cpp2
3 files changed, 5 insertions, 6 deletions
diff --git a/xbmc/platform/linux/PlatformDefs.h b/xbmc/platform/linux/PlatformDefs.h
index 483157b878..27262b7c22 100644
--- a/xbmc/platform/linux/PlatformDefs.h
+++ b/xbmc/platform/linux/PlatformDefs.h
@@ -161,7 +161,6 @@ typedef LPCWSTR LPCTSTR;
#else
typedef LPCSTR LPCTSTR;
#endif
-typedef unsigned __int64 ULONGLONG;
#define MAXWORD 0xffff
@@ -179,7 +178,7 @@ typedef union _LARGE_INTEGER
DWORD LowPart;
DWORD HighPart;
} u;
- ULONGLONG QuadPart;
+ unsigned long long QuadPart;
} ULARGE_INTEGER, *PULARGE_INTEGER;
void OutputDebugString(LPCTSTR lpOutputString);
diff --git a/xbmc/platform/linux/XFileUtils.cpp b/xbmc/platform/linux/XFileUtils.cpp
index b110b66277..9805cb77c5 100644
--- a/xbmc/platform/linux/XFileUtils.cpp
+++ b/xbmc/platform/linux/XFileUtils.cpp
@@ -259,13 +259,13 @@ int GetDiskFreeSpaceEx(
#endif
if (lpFreeBytesAvailable)
- lpFreeBytesAvailable->QuadPart = (ULONGLONG)fsInfo.f_bavail * (ULONGLONG)fsInfo.f_bsize;
+ lpFreeBytesAvailable->QuadPart = static_cast<unsigned long long>(fsInfo.f_bavail) * static_cast<unsigned long long>(fsInfo.f_bsize);
if (lpTotalNumberOfBytes)
- lpTotalNumberOfBytes->QuadPart = (ULONGLONG)fsInfo.f_blocks * (ULONGLONG)fsInfo.f_bsize;
+ lpTotalNumberOfBytes->QuadPart = static_cast<unsigned long long>(fsInfo.f_blocks) * static_cast<unsigned long long>(fsInfo.f_bsize);
if (lpTotalNumberOfFreeBytes)
- lpTotalNumberOfFreeBytes->QuadPart = (ULONGLONG)fsInfo.f_bfree * (ULONGLONG)fsInfo.f_bsize;
+ lpTotalNumberOfFreeBytes->QuadPart = static_cast<unsigned long long>(fsInfo.f_bfree) * static_cast<unsigned long long>(fsInfo.f_bsize);
return 1;
}
diff --git a/xbmc/platform/linux/XTimeUtils.cpp b/xbmc/platform/linux/XTimeUtils.cpp
index 96471a06e5..fca86086d3 100644
--- a/xbmc/platform/linux/XTimeUtils.cpp
+++ b/xbmc/platform/linux/XTimeUtils.cpp
@@ -88,7 +88,7 @@ int FileTimeToLocalFileTime(const FILETIME* lpFileTime, LPFILETIME lpLocalFileTi
FileTimeToTimeT(lpFileTime, &ft);
localtime_r(&ft, &tm_ft);
- l.QuadPart += (ULONGLONG)tm_ft.tm_gmtoff * 10000000;
+ l.QuadPart += static_cast<unsigned long long>(tm_ft.tm_gmtoff) * 10000000;
lpLocalFileTime->dwLowDateTime = l.u.LowPart;
lpLocalFileTime->dwHighDateTime = l.u.HighPart;