# HG changeset patch # User Gregory S. Read # Date 1017807474 0 # Node ID b17e948923940dbe274c26276de3a61d140f5b4b # Parent a893392b1628de86ad93928d3b1744ee0ada453a -Made type cast changes that Ryan needs to approve. -MSVC complained about 64-bit to 32-bit implicit conversions. -Added Win32 specific #defines for 64-bit datatypes. diff -r a893392b1628 -r b17e94892394 physfs.c --- a/physfs.c Wed Apr 03 04:15:24 2002 +0000 +++ b/physfs.c Wed Apr 03 04:17:54 2002 +0000 @@ -110,7 +110,8 @@ __PHYSFS_platformGrabMutex(errorLock); if (errorMessages != NULL) { - tid = __PHYSFS_platformGetThreadID(); + /*!!! I think tid needs to be a 64-bit value??? */ + tid = (int)__PHYSFS_platformGetThreadID(); for (i = errorMessages; i != NULL; i = i->next) { @@ -143,7 +144,8 @@ return; /* uhh...? */ memset((void *) err, '\0', sizeof (ErrMsg)); - err->tid = __PHYSFS_platformGetThreadID(); + /*!!! I think tid needs to be a 64-bit value??? */ + err->tid = (int)__PHYSFS_platformGetThreadID(); __PHYSFS_platformGrabMutex(errorLock); err->next = errorMessages; diff -r a893392b1628 -r b17e94892394 physfs.h --- a/physfs.h Wed Apr 03 04:15:24 2002 +0000 +++ b/physfs.h Wed Apr 03 04:17:54 2002 +0000 @@ -129,6 +129,10 @@ #ifndef _INCLUDE_PHYSFS_H_ #define _INCLUDE_PHYSFS_H_ +#ifdef _WIN32 +#include +#endif + #ifdef __cplusplus extern "C" { #endif @@ -151,6 +155,10 @@ #ifdef PHYSFS_NO_64BIT_SUPPORT /* oh well. */ typedef PHYSFS_uint32 PHYSFS_uint64; typedef PHYSFS_sint32 PHYSFS_sint64; +#elif _WIN32 +/*!!! No 64-bit unsigned in Win32???? */ +typedef LONGLONG PHYSFS_sint64; +typedef LONGLONG PHYSFS_uint64; #else typedef unsigned long long PHYSFS_uint64; typedef signed long long PHYSFS_sint64;