From a902f1628b24a6123b9279333944585aa7689d80 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 28 Sep 2015 13:25:17 +0200 Subject: [PATCH] Fix Win64 compilation --- dtool/src/parser-inc/iostream | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dtool/src/parser-inc/iostream b/dtool/src/parser-inc/iostream index fac16148b4..296a324149 100644 --- a/dtool/src/parser-inc/iostream +++ b/dtool/src/parser-inc/iostream @@ -47,15 +47,13 @@ __published: class ios : public ios_base { __published: typedef long fmtflags; -#ifdef _WIN64 - typedef unsigned __int64 streampos; - typedef __int64 streamoff; -#elif defined(_WIN32) - typedef unsigned long streampos; - typedef long streamoff; -#else +#if defined(_WIN64) || !defined(_WIN32) typedef unsigned long long streampos; typedef long long streamoff; +#else + // 32-bit Windows uses 32-bit stream offsets. + typedef unsigned long streampos; + typedef long streamoff; #endif bool good() const;