CogVM source as per VMMaker.oscog-eem.2929

Bow to LLP64 and type ioMicroMSecs as unigned int.

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.
 */
 
-usqInt ioMSecs(void);
-usqInt ioMicroMSecs(void);
+unsigned int ioMSecs(void);
+unsigned int 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);
-	usqInt (*ioMicroMSecs)(void);
+	unsigned int (*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);
-usqInt ioMicroMSecs(void);
+unsigned int ioMicroMSecs(void);
 unsigned long long  ioUTCMicroseconds(void);
 unsigned long long  ioUTCMicrosecondsNow(void);
 void forceInterruptCheck(void);

platforms/Mac OS/vm/Developer/sqMacMinimal.c

@@ -453,7 +453,7 @@ int ioGetKeystroke(void) {
 	return keystate;
 }
 
-int ioMicroMSecs(void) {
+unsigned int ioMicroMSecs(void) {
 	/* millisecond clock based on microsecond timer (about 60 times slower than clock()!!) */
 	/* Note: This function and ioMSecs() both return a time in milliseconds. The difference
 	   is that ioMicroMSecs() is called only when precise millisecond resolution is essential,
@@ -468,7 +468,7 @@ int ioMicroMSecs(void) {
 	return (microTicks.lo / 1000) + (microTicks.hi * 4294967);
 }
 
-sqInt ioMSecs(void) {
+unsigned int ioMSecs(void) {
 	/* return a time in milliseconds for use in Delays and Time millisecondClockValue */
 	/* Note: This was once a macro based on clock(); it now uses the microsecond clock for
 	   greater resolution. See the comment in ioMicroMSecs(). */

platforms/Mac OS/vm/sqMacTime.c

@@ -70,7 +70,7 @@ SetUpTimers(void)
     PrimeTime((QElemPtr)&gTMTask.qLink,LOW_RES_TICK_MSECS);
 }
 
-int
+unsigned int
 ioMicroMSecs(void)
 {
   struct timeval now;
@@ -122,7 +122,7 @@ sqInt ioRelinquishProcessorForMicroseconds(sqInt microSeconds) {
 #undef ioMSecs
 //Issue with unix aio.c sept 2003
 
-long ioMSecs() { return ioMicroMSecs(); }
+unsigned int ioMSecs() { return ioMicroMSecs(); }
 
 #define SecondsFrom1901To1970      2177452800ULL
 #define MicrosecondsFrom1901To1970 2177452800000000ULL

platforms/Plan9/vm/sqPlan9io.c

@@ -77,7 +77,7 @@ ioMSecs(void)
 	return (now - start_time)/1000000;
 }
 
-usqInt
+unsigned int
 ioMicroMSecs(void) { return ioMSecs(); }
 
 sqInt ioSeconds(void) {

platforms/RiscOS/vm/sqRPCMain.c

@@ -361,7 +361,7 @@ unsigned int microsecondsvalue(void) {
 	return 1000 * millisecondTimerValue();
 }
 
-usqInt
+unsigned int
 ioMicroMSecs(void) {
 /* The
    function ioMicroMSecs() is used only to collect timing statistics

platforms/minheadless/common/sqaio.h

@@ -109,7 +109,8 @@ extern unsigned long long ioUTCMicrosecondsNow(void);
       platReportError((os_error *)&privateErr); \
     } while (0)
 # else /* !ACORN */
-    extern long aioLastTick, aioThisTick, ioMSecs(void);
+    extern long aioLastTick, aioThisTick; \
+	extern unsigned int ioMSecs(void);
 	extern const char *__shortFileName(const char *);
 #   define FPRINTF(X) do { \
 	aioThisTick = ioMSecs(); \

platforms/unix/vm/sqUnixHeartbeat.c

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

platforms/unix/vm/sqUnixITimerHeartbeat.c

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

platforms/unix/vm/sqUnixITimerTickerHeartbeat.c

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