summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsheby <msheby@cinecert.com>2009-03-12 17:20:36 +0000
committermsheby <>2009-03-12 17:20:36 +0000
commit642b80a267c31c2075198068d363c3306d5353b2 (patch)
tree2c2fdf20ab2c4660ad375a08b59e996746aae66c
parent049da36d618fc0e2b22e9546e238e92ade766195 (diff)
Win32 platform portability fixes.
-rw-r--r--src/KM_fileio.cpp2
-rwxr-xr-xsrc/KM_fileio.h1
-rw-r--r--src/KM_tai.h3
3 files changed, 4 insertions, 2 deletions
diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp
index c008957..978f6f9 100644
--- a/src/KM_fileio.cpp
+++ b/src/KM_fileio.cpp
@@ -1069,7 +1069,7 @@ Kumu::Result_t
Kumu::ReadFileIntoObject(const std::string& Filename, Kumu::IArchive& Object, ui32_t max_size)
{
ByteString Buffer;
- ui32_t file_size = FileSize(Filename);
+ ui32_t file_size = static_cast<ui32_t>(FileSize(Filename));
Result_t result = Buffer.Capacity(file_size);
if ( KM_SUCCESS(result) )
diff --git a/src/KM_fileio.h b/src/KM_fileio.h
index fbe15c1..448cf76 100755
--- a/src/KM_fileio.h
+++ b/src/KM_fileio.h
@@ -73,6 +73,7 @@ namespace Kumu
#ifdef KM_WIN32
typedef __int64 fsize_t;
typedef __int64 fpos_t;
+ typedef HANDLE FileHandle;
enum SeekPos_t {
SP_BEGIN = FILE_BEGIN,
diff --git a/src/KM_tai.h b/src/KM_tai.h
index 63336e7..6495dbd 100644
--- a/src/KM_tai.h
+++ b/src/KM_tai.h
@@ -80,8 +80,9 @@ namespace Kumu
};
//
- struct caltime
+ class caltime
{
+ public:
caldate date;
i32_t hour;
i32_t minute;