Fix compilation on win32 given recet changes to what sq.h and sqVirtualMachine.h

define. Make the type of io[Micro]MSecs usqInt because a) these are unsigned
clocks and b) usqInt is the word size and so generates the simplest client code.

Author: eliotmiranda

platforms/Cross/vm/sq.h

@@ -97,8 +97,8 @@
    the clock to return the time right now, rather than of the last heartbeat.
 */
 
-long ioMSecs(void);
-long ioMicroMSecs(void);
+usqInt ioMSecs(void);
+usqInt ioMicroMSecs(void);
 
 /* duplicate the generated definition in the interpreter.  If they differ the
  * compiler will complain and catch it for us.  We use 0x1FFFFFFF instead of

platforms/Cross/vm/sqVirtualMachine.h

@@ -239,7 +239,7 @@ typedef struct VirtualMachine {
 #if VM_PROXY_MINOR > 3
 
 	void *(*ioLoadFunctionFrom)(char *fnName, char *modName);
-	sqInt (*ioMicroMSecs)(void);
+	usqInt (*ioMicroMSecs)(void);
 
 #endif
 
@@ -544,7 +544,7 @@ sqInt showDisplayBitsLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r,
 sqInt signalSemaphoreWithIndex(sqInt semaIndex);
 sqInt success(sqInt aBoolean);
 sqInt superclassOf(sqInt classPointer);
-sqInt ioMicroMSecs(void);
+usqInt ioMicroMSecs(void);
 unsigned long long  ioUTCMicroseconds(void);
 unsigned long long  ioUTCMicrosecondsNow(void);
 void forceInterruptCheck(void);

platforms/Plan9/vm/sqPlan9io.c

@@ -70,12 +70,15 @@ void ioDestroy(void) {
 }
 
 /* Time */
-long ioMSecs(void) {
+usqInt
+ioMSecs(void)
+{
 	vlong now = nsec();
 	return (now - start_time)/1000000;
 }
 
-long ioMicroMSecs(void) { return ioMSecs(); }
+usqInt
+ioMicroMSecs(void) { return ioMSecs(); }
 
 sqInt ioSeconds(void) {
 	return (sqInt)convertToSqueakTime(time(NULL));

platforms/RiscOS/vm/sqRPCMain.c

@@ -361,7 +361,8 @@ unsigned int microsecondsvalue(void) {
 	return 1000 * millisecondTimerValue();
 }
 
-sqInt ioMicroMSecs(void) {
+usqInt
+ioMicroMSecs(void) {
 /* The
    function ioMicroMSecs() is used only to collect timing statistics
    for the garbage collector and other VM facilities. (The function

platforms/iOS/vm/Common/Classes/sqMacV2Time.c

@@ -90,7 +90,7 @@ sqLong ioMicroSeconds(void)
 	return theTimeIs;
 }
 
-sqInt ioMicroMSecs(void)
+usqInt ioMicroMSecs(void)
 {
 	//API Documented
 	struct timeval now;
@@ -106,7 +106,7 @@ sqInt ioMicroMSecs(void)
 	return theTimeIs;
 }
 
-sqInt ioMSecs(void) {
+usqInt ioMSecs(void) {
 	//API Documented
 	return ioMicroMSecs();
 }

platforms/minheadless/generic/sqPlatformSpecific-Generic.c

@@ -42,13 +42,13 @@ osCogStackPageHeadroom(void)
     return 1024;
 }
 
-long
+usqInt
 ioMSecs(void)
 {
     return 0;
 }
 
-long
+usqInt
 ioMicroMSecs(void)
 {
     return 0;

platforms/minheadless/unix/sqUnixHeartbeat.c

@@ -204,11 +204,12 @@ unsigned long long
 ioLocalMicrosecondsNow() { return currentUTCMicroseconds() + vmGMTOffset; };
 
 /* ioMSecs answers the millisecondClock as of the last tick. */
-long
+usqInt
 ioMSecs() { return millisecondClock; }
 
 /* ioMicroMSecs answers the millisecondClock right now */
-long ioMicroMSecs(void) { return microToMilliseconds(currentUTCMicroseconds());}
+usqInt
+ioMicroMSecs(void) { return microToMilliseconds(currentUTCMicroseconds());}
 
 /* returns the local wall clock time */
 sqInt

platforms/minheadless/windows/sqWin32Heartbeat.c

@@ -262,11 +262,12 @@ unsigned long long
 ioLocalMicrosecondsNow() { return ioUTCMicrosecondsNow() + vmGMTOffset; };
 
 /* ioMSecs answers the millisecondClock as of the last tick. */
-long
+usqInt
 ioMSecs() { return millisecondClock; }
 
 /* ioMicroMSecs answers the millisecondClock right now */
-long ioMicroMSecs(void) { return microToMilliseconds(ioUTCMicrosecondsNow());}
+usqInt
+ioMicroMSecs(void) { return microToMilliseconds(ioUTCMicrosecondsNow());}
 
 /* returns the local wall clock time */
 sqInt

platforms/minheadless/windows/sqWin32Time.c

@@ -49,7 +49,8 @@ int ioSeconds(void)
   return convertToSqueakTime(sysTime);
 }
 
-int ioMSecs()
+usqInt
+ioMSecs()
 {
   /* Make sure the value fits into Squeak SmallIntegers */
 #ifndef _WIN32_WCE
@@ -60,7 +61,8 @@ int ioMSecs()
 }
 
 /* Note: ioMicroMSecs returns *milli*seconds */
-int ioMicroMSecs(void)
+usqInt
+ioMicroMSecs(void)
 {
   /* Make sure the value fits into Squeak SmallIntegers */
   return timeGetTime() & MillisecondClockMask;

platforms/unix/misc/threadValidate/sqUnixHeartbeat.c

@@ -81,7 +81,7 @@ ioUpdateVMTimezone()
 	vmGMTOffset = localtime(&utctt)->tm_gmtoff * MicrosecondsPerSecond;
 }
 
-int
+usqInt
 ioMSecs()
 {
 	return ((get64(utcMicrosecondClock) - utcStartMicroseconds)
@@ -105,7 +105,7 @@ ioHighResClock(void)
 }
 
 /* Note: ioMicroMSecs returns *milli*seconds */
-int ioMicroMSecs(void)
+usqInt ioMicroMSecs(void)
 {
 	updateMicrosecondClock();
 	return ioMSecs();