diff -r 8827d8c188df -r 2fd416e4b589 ExternalFunction.st --- a/ExternalFunction.st Tue Jul 22 17:41:20 1997 +0200 +++ b/ExternalFunction.st Tue Jul 22 17:44:51 1997 +0200 @@ -26,7 +26,7 @@ * * CAVEAT: floats are not allowed. */ -int +INT convertST_to_C(stObj) OBJ stObj; { @@ -34,35 +34,35 @@ OBJ *oP; if (__isString(stObj) || __isSymbol(stObj)) { - return (int)(__stringVal(stObj)); + return (INT)(__stringVal(stObj)); } if (__isByteArray(stObj)) { - return (int)(__ByteArrayInstPtr(stObj)->ba_element); + return (INT)(__ByteArrayInstPtr(stObj)->ba_element); } if (__isExternalBytes(stObj)) { - return (int)(__externalBytesAddress(stObj)); + return (INT)(__externalBytesAddress(stObj)); } if (__isExternalAddress(stObj)) { - return (int)(__externalAddressVal(stObj)); + return (INT)(__externalAddressVal(stObj)); } if (__isExternalFunction(stObj)) { - return (int)(__externalFunctionVal(stObj)); + return (INT)(__externalFunctionVal(stObj)); } if (__isSmallInteger(stObj)) { - return (int)(__intVal(stObj)); + return (INT)(__intVal(stObj)); } if (__isLargeInteger(stObj)) { - return (int)(__signedLongIntVal(stObj)); + return (INT)(__signedLongIntVal(stObj)); } if (__isCharacter(stObj)) { - return (int)(__intVal(__characterVal(stObj))); + return (INT)(__intVal(__characterVal(stObj))); } if (stObj == nil) { return 0; } if (__qClass(stObj) == @global(ShortFloat)) { - return (int)(__shortFloatVal(stObj)); + return (INT)(__shortFloatVal(stObj)); } flags = __intVal(__ClassInstPtr(__qClass(stObj))->c_flags) & ARRAYMASK; @@ -70,28 +70,28 @@ oP = (OBJ *)__InstPtr(stObj)->i_instvars[nInst]; if (flags & FLOATARRAY) { - return (int)(oP); + return (INT)(oP); } if (flags & DOUBLEARRAY) { - return (int)(oP); + return (INT)(oP); } if (flags & DOUBLEARRAY) { - return (int)(oP); + return (INT)(oP); } if (flags & BYTEARRAY) { - return (int)(oP); + return (INT)(oP); } if (flags & WORDARRAY) { - return (int)(oP); + return (INT)(oP); } if (flags & LONGARRAY) { - return (int)(oP); + return (INT)(oP); } if (flags & SWORDARRAY) { - return (int)(oP); + return (INT)(oP); } if (flags & SLONGARRAY) { - return (int)(oP); + return (INT)(oP); } if (stObj == true) { @@ -421,7 +421,7 @@ " %{ INTFUNC func; - int retVal; + INT retVal; func = (INTFUNC) __INST(code_); if (func) { @@ -445,7 +445,7 @@ " %{ INTFUNC func; - int retVal; + INT retVal; func = (INTFUNC) __INST(code_); if (func) { @@ -654,6 +654,6 @@ !ExternalFunction class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunction.st,v 1.13 1996-07-15 06:37:06 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunction.st,v 1.14 1997-07-22 15:44:46 cg Exp $' ! ! ExternalFunction initialize!