--- a/ExtBytes.st Tue Jul 22 17:41:20 1997 +0200
+++ b/ExtBytes.st Tue Jul 22 17:44:51 1997 +0200
@@ -656,7 +656,7 @@
int addr;
if (__INST(address_) != nil) {
- addr = (int)__INST(address_);
+ addr = (INT)__INST(address_);
if (addr <= _MAX_INT) {
RETURN ( __MKSMALLINT(addr) );
}
@@ -1072,6 +1072,6 @@
!ExternalBytes class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtBytes.st,v 1.10 1996-12-16 12:37:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtBytes.st,v 1.11 1997-07-22 15:43:58 cg Exp $'
! !
ExternalBytes initialize!
--- a/ExtFunc.st Tue Jul 22 17:41:20 1997 +0200
+++ b/ExtFunc.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/Attic/ExtFunc.st,v 1.13 1996-07-15 06:37:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtFunc.st,v 1.14 1997-07-22 15:44:46 cg Exp $'
! !
ExternalFunction initialize!
--- a/ExternalBytes.st Tue Jul 22 17:41:20 1997 +0200
+++ b/ExternalBytes.st Tue Jul 22 17:44:51 1997 +0200
@@ -656,7 +656,7 @@
int addr;
if (__INST(address_) != nil) {
- addr = (int)__INST(address_);
+ addr = (INT)__INST(address_);
if (addr <= _MAX_INT) {
RETURN ( __MKSMALLINT(addr) );
}
@@ -1072,6 +1072,6 @@
!ExternalBytes class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ExternalBytes.st,v 1.10 1996-12-16 12:37:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ExternalBytes.st,v 1.11 1997-07-22 15:43:58 cg Exp $'
! !
ExternalBytes initialize!
--- 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!
--- a/ObjMem.st Tue Jul 22 17:41:20 1997 +0200
+++ b/ObjMem.st Tue Jul 22 17:44:51 1997 +0200
@@ -999,9 +999,9 @@
RETURN ( nil );
}
if ((unsigned)anObject <= _MAX_INT) {
- RETURN ( __MKSMALLINT((int)anObject) );
+ RETURN ( __MKSMALLINT((INT)anObject) );
}
- RETURN ( __MKUINT((int)anObject) );
+ RETURN ( __MKUINT((INT)anObject) );
%}
"
|p|
@@ -4129,6 +4129,6 @@
!ObjectMemory class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Attic/ObjMem.st,v 1.144 1997-05-09 19:11:49 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Attic/ObjMem.st,v 1.145 1997-07-22 15:44:51 cg Exp $'
! !
ObjectMemory initialize!
--- a/ObjectMemory.st Tue Jul 22 17:41:20 1997 +0200
+++ b/ObjectMemory.st Tue Jul 22 17:44:51 1997 +0200
@@ -999,9 +999,9 @@
RETURN ( nil );
}
if ((unsigned)anObject <= _MAX_INT) {
- RETURN ( __MKSMALLINT((int)anObject) );
+ RETURN ( __MKSMALLINT((INT)anObject) );
}
- RETURN ( __MKUINT((int)anObject) );
+ RETURN ( __MKUINT((INT)anObject) );
%}
"
|p|
@@ -4129,6 +4129,6 @@
!ObjectMemory class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.144 1997-05-09 19:11:49 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.145 1997-07-22 15:44:51 cg Exp $'
! !
ObjectMemory initialize!