-Made type cast changes that Ryan needs to approve.
authorGregory S. Read <zeph@clutteredmind.org>
Wed, 03 Apr 2002 04:17:54 +0000
changeset 160 b17e94892394
parent 159 a893392b1628
child 161 4fcc863fdc5f
-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.
physfs.c
physfs.h
--- 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;
--- 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 <windows.h>
+#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;