--- a/ExternalStream.st	Fri Jul 08 18:41:53 2005 +0200
+++ b/ExternalStream.st	Fri Jul 08 19:15:03 2005 +0200
@@ -273,7 +273,7 @@
     if (isBuffered) {                                   \
 	ungetc((c), (f));                               \
     } else {                                            \
-      __INST(readAhead) = __MKSMALLINT((c));            \
+      __INST(readAhead) = __mkSmallInteger((c));            \
     }
 
 # define __READBYTE__(ret, f, buf, isBuffered)          \
@@ -719,13 +719,13 @@
 
 # ifdef NO_STDIO
 #  define __UNGETC__(c, f, isBuffered)                  \
-    __INST(readAhead) = __MKSMALLINT((c));
+    __INST(readAhead) = __mkSmallInteger((c));
 # else /* use STDIO */
 #  define __UNGETC__(c, f, isBuffered)                  \
     if (isBuffered) {                                   \
 	ungetc((c), (f));                               \
     } else {                                            \
-	__INST(readAhead) = __MKSMALLINT((c));          \
+	__INST(readAhead) = __mkSmallInteger((c));          \
     }
 # endif /* use STDIO */
 
@@ -2412,7 +2412,7 @@
 		    __INST(hitEOF) = true;
 		    break;
 		} else {
-		    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		    goto err;
 		}
 	    }
@@ -2436,7 +2436,7 @@
 			__INST(hitEOF) = true;
 			break;
 		    }
-		    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		    goto err;
 		}
 
@@ -2569,7 +2569,7 @@
 		RETURN ( self );
 	    }
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 %}.
     super nextPutLine:aString.
@@ -2617,7 +2617,7 @@
 	    for (;;) {
 		if (fgets(buffer, sizeof(buffer)-1, src) == NULL) {
 		    if (ferror(src)) {
-			readError = __MKSMALLINT(__threadErrno);
+			readError = __mkSmallInteger(__threadErrno);
 			__END_INTERRUPTABLE__
 			goto err;
 		    }
@@ -2625,7 +2625,7 @@
 		}
 		if (fputs(buffer, dst) == EOF) {
 		    if (ferror(dst)) {
-			__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+			__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 			__END_INTERRUPTABLE__
 			goto err;
 		    }
@@ -2733,7 +2733,7 @@
 
 	    if (cp == NULL) {
 		if (ferror(f)) {
-		    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		    goto err;
 		} else {
 		    FSEEK(f, firstpos);
@@ -2961,10 +2961,10 @@
 	    __END_INTERRUPTABLE__
 
 	    if (ret >= 0) {
-		RETURN ( __MKSMALLINT(ret) );
+		RETURN ( __mkSmallInteger(ret) );
 	    }
 	    __INST(position) = nil; /* i.e. do not know */
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	}
     }
 # endif
@@ -3202,7 +3202,7 @@
 		} else {
 		    __INST(position) = nil; /* i.e. do not know */
 		}
-		RETURN (__MKSMALLINT(ret));
+		RETURN (__mkSmallInteger(ret));
 	    }
 #ifdef PRE_22_jan_2000
 	    if (ret == 0) {
@@ -3211,7 +3211,7 @@
 #endif
 	    {
 		__INST(position) = nil;
-		__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	    }
 	}
     }
@@ -3257,14 +3257,14 @@
 	    } else {
 		__INST(position) = nil; /* i.e. do not know */
 	    }
-	    RETURN (__MKSMALLINT(byte));
+	    RETURN (__mkSmallInteger(byte));
 	}
 
 	if (ret == 0) {
 	    __INST(hitEOF) = true;
 	} else /* ret < 0 */ {
 	    __INST(position) = nil;
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	}
     }
 %}.
@@ -3374,13 +3374,13 @@
 		} else {
 		    __INST(position) = nil; /* i.e. do not know */
 		}
-		RETURN (__MKSMALLINT(ret));
+		RETURN (__mkSmallInteger(ret));
 	    }
 	    if (ret == 0) {
 		__INST(hitEOF) = true;
 	    } else /* ret < 0 */ {
 		__INST(position) = nil;
-		__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	    }
 	}
     }
@@ -3463,10 +3463,10 @@
 #endif
 	    }
 #if __POINTER_SIZE__ == 8
-	    RETURN ( __MKSMALLINT(value));
+	    RETURN ( __mkSmallInteger(value));
 #else
 	    if ((value >= _MIN_INT) && (value <= _MAX_INT)) {
-		RETURN ( __MKSMALLINT(value));
+		RETURN ( __mkSmallInteger(value));
 	    }
 	    RETURN ( __MKLARGEINT(value) );
 #endif
@@ -3474,7 +3474,7 @@
 
 	if (ret < 0) {
 	    __INST(position) = nil;
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */ {
 	    __INST(hitEOF) = true;
 	}
@@ -3537,12 +3537,12 @@
 		value = ((u.buffer[1] & 0xFF) << 8) | (u.buffer[0] & 0xFF);
 #endif
 	    }
-	    RETURN (__MKSMALLINT(value));
+	    RETURN (__mkSmallInteger(value));
 	}
 
 	if (ret < 0) {
 	    __INST(position) = nil; /* i.e. do not know */
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */ {
 	    __INST(hitEOF) = true;
 	}
@@ -3614,10 +3614,10 @@
 	    }
 #if __POINTER_SIZE__ == 8
 	    value &= 0xFFFFFFFF;
-	    RETURN (__MKSMALLINT(value));
+	    RETURN (__mkSmallInteger(value));
 #else
 	    if (value <= _MAX_INT) {
-		RETURN (__MKSMALLINT(value));
+		RETURN (__mkSmallInteger(value));
 	    }
 	    RETURN (__MKULARGEINT(value) );
 #endif
@@ -3625,7 +3625,7 @@
 
 	if (ret < 0) {
 	    __INST(position) = nil; /* i.e. do not know */
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */ {
 	    __INST(hitEOF) = true;
 	}
@@ -3688,12 +3688,12 @@
 		value = (u.buffer[1] << 8) | u.buffer[0];
 #endif
 	    }
-	    RETURN (__MKSMALLINT(value));
+	    RETURN (__mkSmallInteger(value));
 	}
 
 	if (ret < 0) {
 	    __INST(position) = nil; /* i.e. do not know */
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */ {
 	    __INST(hitEOF) = true;
 	}
@@ -3757,7 +3757,7 @@
 	if (cnt < 0) {
 	    __INST(position) = nil; /* i.e. do not know */
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 %}.
     filePointer isNil ifTrue:[self errorNotOpen. ^ self].
@@ -3851,7 +3851,7 @@
 		} else {
 		    __INST(position) = nil; /* i.e. do not know */
 		}
-		RETURN ( __MKSMALLINT(cnt) );
+		RETURN ( __mkSmallInteger(cnt) );
 	    }
 	    if (
 #ifdef EWOULDBLOCK
@@ -3859,10 +3859,10 @@
 #endif
 		(__threadErrno == EAGAIN)
 	    ) {
-		RETURN ( __MKSMALLINT(0) );
+		RETURN ( __mkSmallInteger(0) );
 	    }
 	    __INST(position) = nil; /* i.e. do not know */
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	}
     }
 bad: ;
@@ -3950,7 +3950,7 @@
 	    RETURN ( self );
 	}
 	__INST(position) = nil; /* i.e. do not know */
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 badArg: ;
 %}.
@@ -4021,7 +4021,7 @@
 	    RETURN ( self );
 	}
 	__INST(position) = nil; /* i.e. do not know */
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 %}.
     lastErrorNumber notNil ifTrue:[self writeError. ^ self.].
@@ -4066,7 +4066,7 @@
      && (__qClass(openmode)== @global(String))) {
 	f = (FILEPOINTER) fdopen(__intVal(aFileDescriptor), (char *)__stringVal(openmode));
 	if (f == NULL) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	    __INST(position) = nil;
 	} else {
 	    if (@global(FileOpenTrace) == true) {
@@ -4122,7 +4122,7 @@
 	__END_INTERRUPTABLE__
 #endif /* UNIX */
 	if (f == NULL) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else {
 	    if (@global(FileOpenTrace) == true) {
 		fprintf(stderr, "fopen %s [ExternalStream] -> %x\n", __stringVal(aPath), f);
@@ -4315,14 +4315,14 @@
 		__INST(position) = nil; /* i.e. do not know */
 	    }
 	    if (__INST(binary) == true) {
-		RETURN ( __MKSMALLINT(ch) );
+		RETURN ( __mkSmallInteger(ch) );
 	    }
 	    RETURN ( __MKCHARACTER(ch) );
 	}
 
 	__INST(position) = nil;
 	if (ret < 0) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */ {
 	    __INST(hitEOF) = true;
 	}
@@ -4408,12 +4408,12 @@
 	    __UNGETC__(c, f, _buffered);
 
 	    if (__INST(binary) == true) {
-		RETURN ( __MKSMALLINT(c) );
+		RETURN ( __mkSmallInteger(c) );
 	    }
 	    RETURN ( __MKCHARACTER(c) );
 	}
 	if (ret < 0) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */ {
 	    __INST(hitEOF) = true;
 	}
@@ -4526,7 +4526,7 @@
 
 	if (ret <= 0) {
 	    if (ret < 0) {
-		__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		goto err;
 	    }
 	    else if (ret == 0)
@@ -4760,7 +4760,7 @@
 	if (ret == 0)
 	    __INST(hitEOF) = true;
 	else /* ret < 0 */
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
     if (__isSmallInteger(__INST(position))) {
 	INT np = __intVal(__INST(position)) + nread;
@@ -4832,7 +4832,7 @@
 		__READBYTE__(ret, f, &c, _buffered);
 		if (ret <= 0) {
 		    if (ret < 0)
-			__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+			__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		    else
 			__INST(hitEOF) = true;
 		    break;
@@ -4904,7 +4904,7 @@
 	    RETURN (false);
 	}
 	if (ret < 0) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */
 	    __INST(hitEOF) = true;
 	}
@@ -4943,7 +4943,7 @@
 		break;
 	}
 	if (ret < 0) {
-	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 	} else /* ret == 0 */ {
 	    __INST(hitEOF) = true;
 	}
@@ -4982,7 +4982,7 @@
 	    __READBYTE__(ret, f, &c, _buffered);
 	    if (ret <= 0) {
 		if (ret < 0) {
-		    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		} else /* ret == 0 */ {
 		    __INST(hitEOF) = true;
 		}
@@ -5038,7 +5038,7 @@
 	    __READBYTE__(ret, f, &c, _buffered);
 	    if (ret <= 0) {
 		if (ret < 0) {
-		    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		} else /* ret == 0 */ {
 		    __INST(hitEOF) = true;
 		}
@@ -5105,7 +5105,7 @@
 	    __READBYTE__(ret, f, &c, _buffered);
 	    if (ret <= 0) {
 		if (ret < 0) {
-		    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		} else /* ret == 0 */ {
 		    __INST(hitEOF) = true;
 		}
@@ -5269,7 +5269,7 @@
 	}
 
 	/* ret < 0 */
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 %}.
     lastErrorNumber notNil ifTrue:[^ self readError].
@@ -5352,9 +5352,9 @@
 	    RETURN(nil)
 	}
 	if (ret < 0) {
-	    RETURN(__MKSMALLINT(__threadErrno));
+	    RETURN(__mkSmallInteger(__threadErrno));
 	} else /* ret == 0 */ {
-	    RETURN(__MKSMALLINT(0)); /* EOF */
+	    RETURN(__mkSmallInteger(0)); /* EOF */
 	}
     }
 %}.
@@ -5627,7 +5627,7 @@
 	    }
 	    RETURN ( self );
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 %}.
     lastErrorNumber notNil ifTrue:[self writeError. ^ self].
@@ -5722,7 +5722,7 @@
 			}
 			RETURN ( self );
 		    }
-		    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 		}
 	    }
 	} else {
@@ -5830,7 +5830,7 @@
 	    }
 	    RETURN (self);
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 out: ;
 %}.
@@ -5926,7 +5926,7 @@
 	    }
 	    RETURN (self);
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
     }
 out: ;
 %}.
@@ -5937,7 +5937,7 @@
 !ExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.291 2005-07-07 15:01:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.292 2005-07-08 17:15:01 cg Exp $'
 ! !
 
 ExternalStream initialize!