UnixOperatingSystem.st
changeset 8913 b9498d27a554
parent 8902 e7fa109f9cbe
child 8934 32a063645991
--- a/UnixOperatingSystem.st	Fri Jul 08 18:41:53 2005 +0200
+++ b/UnixOperatingSystem.st	Fri Jul 08 19:15:03 2005 +0200
@@ -1548,229 +1548,229 @@
 %{  /* NOCONTEXT */
 #ifdef SIGABRT
     if (signalName == @symbol(SIGABRT)) {
-	RETURN ( __MKSMALLINT(SIGABRT) );
+	RETURN ( __mkSmallInteger(SIGABRT) );
     }
 #endif
 #ifdef SIGALRM
     if (signalName == @symbol(SIGALRM)) {
-	RETURN ( __MKSMALLINT(SIGALRM) );
+	RETURN ( __mkSmallInteger(SIGALRM) );
     }
 #endif
 #ifdef SIGBREAK
     if (signalName == @symbol(SIGBREAK)) {
-	RETURN ( __MKSMALLINT(SIGBREAK) );
+	RETURN ( __mkSmallInteger(SIGBREAK) );
     }
 #endif
 #ifdef SIGBUS
     if (signalName == @symbol(SIGBUS)) {
-	RETURN ( __MKSMALLINT(SIGBUS) );
+	RETURN ( __mkSmallInteger(SIGBUS) );
     }
 #endif
 #ifdef SIGCHLD
     if ((signalName == @symbol(SIGCHLD))
      || (signalName == @symbol(SIGCLD)) ) {
-	RETURN ( __MKSMALLINT(SIGCHLD) );
+	RETURN ( __mkSmallInteger(SIGCHLD) );
     }
 #else
 # if defined(SIGCLD)
     if ((signalName == @symbol(SIGCHLD))
      || (signalName == @symbol(SIGCLD)) ) {
-	RETURN ( __MKSMALLINT(SIGCLD) );
+	RETURN ( __mkSmallInteger(SIGCLD) );
     }
 # endif
 #endif
 #ifdef SIGCONT
     if (signalName == @symbol(SIGCONT)) {
-	RETURN ( __MKSMALLINT(SIGCONT) );
+	RETURN ( __mkSmallInteger(SIGCONT) );
     }
 #endif
 #ifdef SIGDANGER
     if (signalName == @symbol(SIGDANGER)) {
-	RETURN ( __MKSMALLINT(SIGDANGER) );
+	RETURN ( __mkSmallInteger(SIGDANGER) );
     }
 #endif
 #ifdef SIGEMT
     if (signalName == @symbol(SIGEMT)) {
-	RETURN ( __MKSMALLINT(SIGEMT) );
+	RETURN ( __mkSmallInteger(SIGEMT) );
     }
 #endif
 #ifdef SIGFPE
     if (signalName == @symbol(SIGFPE)) {
-	RETURN ( __MKSMALLINT(SIGFPE) );
+	RETURN ( __mkSmallInteger(SIGFPE) );
     }
 #endif
 #ifdef SIGGRANT
     if (signalName == @symbol(SIGGRANT)) {
-	RETURN ( __MKSMALLINT(SIGGRANT) );
+	RETURN ( __mkSmallInteger(SIGGRANT) );
     }
 #endif
 #ifdef SIGHUP
     if (signalName == @symbol(SIGHUP)) {
-	RETURN ( __MKSMALLINT(SIGHUP) );
+	RETURN ( __mkSmallInteger(SIGHUP) );
     }
 #endif
 #ifdef SIGILL
     if (signalName == @symbol(SIGILL)) {
-	RETURN ( __MKSMALLINT(SIGILL) );
+	RETURN ( __mkSmallInteger(SIGILL) );
     }
 #endif
 #ifdef SIGINT
     if (signalName == @symbol(SIGINT)) {
-	RETURN ( __MKSMALLINT(SIGINT) );
+	RETURN ( __mkSmallInteger(SIGINT) );
     }
 #endif
 #ifdef SIGIO
     if (signalName == @symbol(SIGIO)) {
-	RETURN ( __MKSMALLINT(SIGIO) );
+	RETURN ( __mkSmallInteger(SIGIO) );
     }
 #endif
 #ifdef SIGIOT
     if (signalName == @symbol(SIGIOT)) {
-	RETURN ( __MKSMALLINT(SIGIOT) );
+	RETURN ( __mkSmallInteger(SIGIOT) );
     }
 #endif
 #ifdef SIGKILL
     if (signalName == @symbol(SIGKILL)) {
-	RETURN ( __MKSMALLINT(SIGKILL) );
+	RETURN ( __mkSmallInteger(SIGKILL) );
     }
 #endif
 #ifdef SIGLOST
     if (signalName == @symbol(SIGLOST)) {
-	RETURN ( __MKSMALLINT(SIGLOST) );
+	RETURN ( __mkSmallInteger(SIGLOST) );
     }
 #endif
 #ifdef SIGMIGRATE
     if (signalName == @symbol(SIGMIGRATE)) {
-	RETURN ( __MKSMALLINT(SIGMIGRATE) );
+	RETURN ( __mkSmallInteger(SIGMIGRATE) );
     }
 #endif
 #ifdef SIGMSG
     if (signalName == @symbol(SIGMSG)) {
-	RETURN ( __MKSMALLINT(SIGMSG) );
+	RETURN ( __mkSmallInteger(SIGMSG) );
     }
 #endif
 #ifdef SIGPIPE
     if (signalName == @symbol(SIGPIPE)) {
-	RETURN ( __MKSMALLINT(SIGPIPE) );
+	RETURN ( __mkSmallInteger(SIGPIPE) );
     }
 #endif
 #ifdef SIGPOLL
     if (signalName == @symbol(SIGPOLL)) {
-	RETURN ( __MKSMALLINT(SIGPOLL) );
+	RETURN ( __mkSmallInteger(SIGPOLL) );
     }
 #endif
 #ifdef SIGPRE
     if (signalName == @symbol(SIGPRE)) {
-	RETURN ( __MKSMALLINT(SIGPRE) );
+	RETURN ( __mkSmallInteger(SIGPRE) );
     }
 #endif
 #ifdef SIGPROF
     if (signalName == @symbol(SIGPROF)) {
-	RETURN ( __MKSMALLINT(SIGPROF) );
+	RETURN ( __mkSmallInteger(SIGPROF) );
     }
 #endif
 #ifdef SIGPWR
     if (signalName == @symbol(SIGPWR)) {
-	RETURN ( __MKSMALLINT(SIGPWR) );
+	RETURN ( __mkSmallInteger(SIGPWR) );
     }
 #endif
 #ifdef SIGQUIT
     if (signalName == @symbol(SIGQUIT)) {
-	RETURN ( __MKSMALLINT(SIGQUIT) );
+	RETURN ( __mkSmallInteger(SIGQUIT) );
     }
 #endif
 #ifdef SIGRETRACT
     if (signalName == @symbol(SIGRETRACT)) {
-	RETURN ( __MKSMALLINT(SIGRETRACT) );
+	RETURN ( __mkSmallInteger(SIGRETRACT) );
     }
 #endif
 #ifdef SIGSAK
     if (signalName == @symbol(SIGSAK)) {
-	RETURN ( __MKSMALLINT(SIGSAK) );
+	RETURN ( __mkSmallInteger(SIGSAK) );
     }
 #endif
 #ifdef SIGSEGV
     if (signalName == @symbol(SIGSEGV)) {
-	RETURN ( __MKSMALLINT(SIGSEGV) );
+	RETURN ( __mkSmallInteger(SIGSEGV) );
     }
 #endif
 #ifdef SIGSOUND
     if (signalName == @symbol(SIGSOUND)) {
-	RETURN ( __MKSMALLINT(SIGSOUND) );
+	RETURN ( __mkSmallInteger(SIGSOUND) );
     }
 #endif
 #ifdef SIGSTOP
     if (signalName == @symbol(SIGSTOP)) {
-	RETURN ( __MKSMALLINT(SIGSTOP) );
+	RETURN ( __mkSmallInteger(SIGSTOP) );
     }
 #endif
 #ifdef SIGSYS
     if (signalName == @symbol(SIGSYS)) {
-	RETURN ( __MKSMALLINT(SIGSYS) );
+	RETURN ( __mkSmallInteger(SIGSYS) );
     }
 #endif
 #ifdef SIGTERM
     if (signalName == @symbol(SIGTERM)) {
-	RETURN ( __MKSMALLINT(SIGTERM) );
+	RETURN ( __mkSmallInteger(SIGTERM) );
     }
 #endif
 #ifdef SIGTRAP
     if (signalName == @symbol(SIGTRAP)) {
-	RETURN ( __MKSMALLINT(SIGTRAP) );
+	RETURN ( __mkSmallInteger(SIGTRAP) );
     }
 #endif
 #ifdef SIGTSTP
     if (signalName == @symbol(SIGTSTP)) {
-	RETURN ( __MKSMALLINT(SIGTSTP) );
+	RETURN ( __mkSmallInteger(SIGTSTP) );
     }
 #endif
 #ifdef SIGTTIN
     if (signalName == @symbol(SIGTTIN)) {
-	RETURN ( __MKSMALLINT(SIGTTIN) );
+	RETURN ( __mkSmallInteger(SIGTTIN) );
     }
 #endif
 #ifdef SIGTTOU
     if (signalName == @symbol(SIGTTOU)) {
-	RETURN ( __MKSMALLINT(SIGTTOU) );
+	RETURN ( __mkSmallInteger(SIGTTOU) );
     }
 #endif
 #ifdef SIGURG
     if (signalName == @symbol(SIGURG)) {
-	RETURN ( __MKSMALLINT(SIGURG) );
+	RETURN ( __mkSmallInteger(SIGURG) );
     }
 #endif
 #ifdef SIGUSR1
     if (signalName == @symbol(SIGUSR1)) {
-	RETURN ( __MKSMALLINT(SIGUSR1) );
+	RETURN ( __mkSmallInteger(SIGUSR1) );
     }
 #endif
 #ifdef SIGUSR2
     if (signalName == @symbol(SIGUSR2)) {
-	RETURN ( __MKSMALLINT(SIGUSR2) );
+	RETURN ( __mkSmallInteger(SIGUSR2) );
     }
 #endif
 #ifdef SIGVTALRM
     if (signalName == @symbol(SIGVTALRM)) {
-	RETURN ( __MKSMALLINT(SIGVTALRM) );
+	RETURN ( __mkSmallInteger(SIGVTALRM) );
     }
 #endif
 #ifdef SIGWINCH
     if (signalName == @symbol(SIGWINCH)) {
-	RETURN ( __MKSMALLINT(SIGWINCH) );
+	RETURN ( __mkSmallInteger(SIGWINCH) );
     }
 #endif
 #ifdef SIGXCPU
     if (signalName == @symbol(SIGXCPU)) {
-	RETURN ( __MKSMALLINT(SIGXCPU) );
+	RETURN ( __mkSmallInteger(SIGXCPU) );
     }
 #endif
 #ifdef SIGXFSZ
     if (signalName == @symbol(SIGXFSZ)) {
-	RETURN ( __MKSMALLINT(SIGXFSZ) );
-    }
-#endif
-
-    RETURN ( __MKSMALLINT(0) );
+	RETURN ( __mkSmallInteger(SIGXFSZ) );
+    }
+#endif
+
+    RETURN ( __mkSmallInteger(0) );
 %}
     "
      OperatingSystem signalNamed:#SIGABRT
@@ -1792,7 +1792,7 @@
 
 %{  /* NOCONTEXT */
 
-     RETURN ( __MKSMALLINT(errno) );
+     RETURN ( __mkSmallInteger(errno) );
 %}
      "
       OperatingSystem currentErrorNumber
@@ -2349,229 +2349,229 @@
      */
 #ifdef EPERM
     if (sym == @symbol(EPERM)) {
-	RETURN ( __MKSMALLINT(EPERM) );
+	RETURN ( __mkSmallInteger(EPERM) );
     }
 #endif
 
 #ifdef ENOENT
     if (sym == @symbol(ENOENT)) {
-	RETURN ( __MKSMALLINT(ENOENT) );
+	RETURN ( __mkSmallInteger(ENOENT) );
     }
 #endif
 
 #ifdef ESRCH
     if (sym == @symbol(ESRCH)) {
-	RETURN ( __MKSMALLINT(ESRCH) );
+	RETURN ( __mkSmallInteger(ESRCH) );
     }
 #endif
 
 #ifdef EINTR
     if (sym == @symbol(EINTR)) {
-	RETURN ( __MKSMALLINT(EINTR) );
+	RETURN ( __mkSmallInteger(EINTR) );
     }
 #endif
 
 #ifdef EIO
     if (sym == @symbol(EIO)) {
-	RETURN ( __MKSMALLINT(EIO) );
+	RETURN ( __mkSmallInteger(EIO) );
     }
 #endif
 
 #ifdef ENXIO
     if (sym == @symbol(ENXIO)) {
-	RETURN ( __MKSMALLINT(ENXIO) );
+	RETURN ( __mkSmallInteger(ENXIO) );
     }
 #endif
 
 #ifdef E2BIG
     if (sym == @symbol(E2BIG)) {
-	RETURN ( __MKSMALLINT(E2BIG) );
+	RETURN ( __mkSmallInteger(E2BIG) );
     }
 #endif
 
 #ifdef ENOEXEC
     if (sym == @symbol(ENOEXEC)) {
-	RETURN ( __MKSMALLINT(ENOEXEC) );
+	RETURN ( __mkSmallInteger(ENOEXEC) );
     }
 #endif
 
 #ifdef EBADF
     if (sym == @symbol(EBADF)) {
-	RETURN ( __MKSMALLINT(EBADF) );
+	RETURN ( __mkSmallInteger(EBADF) );
     }
 #endif
 
 #ifdef ECHILD
     if (sym == @symbol(ECHILD)) {
-	RETURN ( __MKSMALLINT(ECHILD) );
+	RETURN ( __mkSmallInteger(ECHILD) );
     }
 #endif
 
 #if defined(EAGAIN)
     if (sym == @symbol(EAGAIN)) {
-	RETURN ( __MKSMALLINT(EAGAIN) );
+	RETURN ( __mkSmallInteger(EAGAIN) );
     }
 #endif
 
 #ifdef ENOMEM
     if (sym == @symbol(ENOMEM)) {
-	RETURN ( __MKSMALLINT(ENOMEM) );
+	RETURN ( __mkSmallInteger(ENOMEM) );
     }
 #endif
 
 #ifdef EACCES
     if (sym == @symbol(EACCES)) {
-	RETURN ( __MKSMALLINT(EACCES) );
+	RETURN ( __mkSmallInteger(EACCES) );
     }
 #endif
 
 #ifdef EFAULT
     if (sym == @symbol(EFAULT)) {
-	RETURN ( __MKSMALLINT(EFAULT) );
+	RETURN ( __mkSmallInteger(EFAULT) );
     }
 #endif
 
 #ifdef EBUSY
     if (sym == @symbol(EBUSY)) {
-	RETURN ( __MKSMALLINT(EBUSY) );
+	RETURN ( __mkSmallInteger(EBUSY) );
     }
 #endif
 
 #ifdef EXDEV
     if (sym == @symbol(EXDEV)) {
-	RETURN ( __MKSMALLINT(EXDEV) );
+	RETURN ( __mkSmallInteger(EXDEV) );
     }
 #endif
 
 #ifdef ENODEV
     if (sym == @symbol(ENODEV)) {
-	RETURN ( __MKSMALLINT(ENODEV) );
+	RETURN ( __mkSmallInteger(ENODEV) );
     }
 #endif
 
 #ifdef ENOTDIR
     if (sym == @symbol(ENOTDIR)) {
-	RETURN ( __MKSMALLINT(ENOTDIR) );
+	RETURN ( __mkSmallInteger(ENOTDIR) );
     }
 #endif
 
 #ifdef EISDIR
     if (sym == @symbol(EISDIR)) {
-	RETURN ( __MKSMALLINT(EISDIR) );
+	RETURN ( __mkSmallInteger(EISDIR) );
     }
 #endif
 
 #ifdef EINVAL
     if (sym == @symbol(EINVAL)) {
-	RETURN ( __MKSMALLINT(EINVAL) );
+	RETURN ( __mkSmallInteger(EINVAL) );
     }
 #endif
 
 #ifdef ENFILE
     if (sym == @symbol(ENFILE)) {
-	RETURN ( __MKSMALLINT(ENFILE) );
+	RETURN ( __mkSmallInteger(ENFILE) );
     }
 #endif
 
 #ifdef EMFILE
     if (sym == @symbol(EMFILE)) {
-	RETURN ( __MKSMALLINT(EMFILE) );
+	RETURN ( __mkSmallInteger(EMFILE) );
     }
 #endif
 
 #ifdef ENOTTY
     if (sym == @symbol(ENOTTY)) {
-	RETURN ( __MKSMALLINT(ENOTTY) );
+	RETURN ( __mkSmallInteger(ENOTTY) );
     }
 #endif
 
 #ifdef EFBIG
     if (sym == @symbol(EFBIG)) {
-	RETURN ( __MKSMALLINT(EFBIG) );
+	RETURN ( __mkSmallInteger(EFBIG) );
     }
 #endif
 
 #ifdef ENOSPC
     if (sym == @symbol(ENOSPC)) {
-	RETURN ( __MKSMALLINT(ENOSPC) );
+	RETURN ( __mkSmallInteger(ENOSPC) );
     }
 #endif
 
 #ifdef ESPIPE
     if (sym == @symbol(ESPIPE)) {
-	RETURN ( __MKSMALLINT(ESPIPE) );
+	RETURN ( __mkSmallInteger(ESPIPE) );
     }
 #endif
 
 #ifdef EROFS
     if (sym == @symbol(EROFS)) {
-	RETURN ( __MKSMALLINT(EROFS) );
+	RETURN ( __mkSmallInteger(EROFS) );
     }
 #endif
 
 #ifdef EMLINK
     if (sym == @symbol(EMLINK)) {
-	RETURN ( __MKSMALLINT(EMLINK) );
+	RETURN ( __mkSmallInteger(EMLINK) );
     }
 #endif
 
 #ifdef EPIPE
     if (sym == @symbol(EPIPE)) {
-	RETURN ( __MKSMALLINT(EPIPE) );
+	RETURN ( __mkSmallInteger(EPIPE) );
     }
 #endif
 
 #ifdef EDOM
     if (sym == @symbol(EDOM)) {
-	RETURN ( __MKSMALLINT(EDOM) );
+	RETURN ( __mkSmallInteger(EDOM) );
     }
 #endif
 
 #ifdef ERANGE
     if (sym == @symbol(ERANGE)) {
-	RETURN ( __MKSMALLINT(ERANGE) );
+	RETURN ( __mkSmallInteger(ERANGE) );
     }
 #endif
 
 #ifdef EDEADLK
     if (sym == @symbol(EDEADLK)) {
-	RETURN ( __MKSMALLINT(EDEADLK) );
+	RETURN ( __mkSmallInteger(EDEADLK) );
     }
 #endif
 
 #ifdef ENAMETOOLONG
     if (sym == @symbol(ENAMETOOLONG)) {
-	RETURN ( __MKSMALLINT(ENAMETOOLONG) );
+	RETURN ( __mkSmallInteger(ENAMETOOLONG) );
     }
 #endif
 
 #ifdef ENOLCK
     if (sym == @symbol(ENOLCK)) {
-	RETURN ( __MKSMALLINT(ENOLCK) );
+	RETURN ( __mkSmallInteger(ENOLCK) );
     }
 #endif
 
 #ifdef ENOSYS
     if (sym == @symbol(ENOSYS)) {
-	RETURN ( __MKSMALLINT(ENOSYS) );
+	RETURN ( __mkSmallInteger(ENOSYS) );
     }
 #endif
 
 #ifdef ENOTEMPTY
     if (sym == @symbol(ENOTEMPTY)) {
-	RETURN ( __MKSMALLINT(ENOTEMPTY) );
+	RETURN ( __mkSmallInteger(ENOTEMPTY) );
     }
 #endif
 
 #ifdef EEXIST
     if (sym == @symbol(EEXIST)) {
-	RETURN ( __MKSMALLINT(EEXIST) );
+	RETURN ( __mkSmallInteger(EEXIST) );
     }
 #endif
 
 #ifdef EILSEQ
     if (sym == @symbol(EILSEQ)) {
-	RETURN ( __MKSMALLINT(EILSEQ) );
+	RETURN ( __mkSmallInteger(EILSEQ) );
     }
 #endif
 
@@ -2580,13 +2580,13 @@
      */
 #ifdef ENOTBLK
     if (sym == @symbol(ENOTBLK)) {
-	RETURN ( __MKSMALLINT(ENOTBLK) );
+	RETURN ( __mkSmallInteger(ENOTBLK) );
     }
 #endif
 
 #ifdef ETXTBSY
     if (sym == @symbol(ETXTBSY)) {
-	RETURN ( __MKSMALLINT(ETXTBSY) );
+	RETURN ( __mkSmallInteger(ETXTBSY) );
     }
 #endif
 
@@ -2595,25 +2595,25 @@
      */
 #ifdef EWOULDBLOCK
     if (sym == @symbol(EWOULDBLOCK)) {
-	RETURN ( __MKSMALLINT(EWOULDBLOCK) );
+	RETURN ( __mkSmallInteger(EWOULDBLOCK) );
     }
 #endif
 
 #ifdef EOVERFLOW
     if (sym == @symbol(EOVERFLOW)) {
-	RETURN ( __MKSMALLINT(EOVERFLOW) );
+	RETURN ( __mkSmallInteger(EOVERFLOW) );
     }
 #endif
 
 #ifdef ENOMSG
     if (sym == @symbol(ENOMSG)) {
-	RETURN ( __MKSMALLINT(ENOMSG) );
+	RETURN ( __mkSmallInteger(ENOMSG) );
     }
 #endif
 
 #ifdef ELOOP
     if (sym == @symbol(ELOOP)) {
-	RETURN ( __MKSMALLINT(ELOOP) );
+	RETURN ( __mkSmallInteger(ELOOP) );
     }
 #endif
 
@@ -2622,31 +2622,31 @@
      */
 #ifdef ETIME
     if (sym == @symbol(ETIME)) {
-	RETURN ( __MKSMALLINT(ETIME) );
+	RETURN ( __mkSmallInteger(ETIME) );
     }
 #endif
 
 #ifdef ENOSR
     if (sym == @symbol(ENOSR)) {
-	RETURN ( __MKSMALLINT(ENOSR) );
+	RETURN ( __mkSmallInteger(ENOSR) );
     }
 #endif
 
 #ifdef ENOSTR
     if (sym == @symbol(ENOSTR)) {
-	RETURN ( __MKSMALLINT(ENOSTR) );
+	RETURN ( __mkSmallInteger(ENOSTR) );
     }
 #endif
 
 #ifdef ECOMM
     if (sym == @symbol(ECOMM)) {
-	RETURN ( __MKSMALLINT(ECOMM) );
+	RETURN ( __mkSmallInteger(ECOMM) );
     }
 #endif
 
 #ifdef EPROTO
     if (sym == @symbol(EPROTO)) {
-	RETURN ( __MKSMALLINT(EPROTO) );
+	RETURN ( __mkSmallInteger(EPROTO) );
     }
 #endif
 
@@ -2655,13 +2655,13 @@
      */
 #ifdef ESTALE
     if (sym == @symbol(ESTALE)) {
-	RETURN ( __MKSMALLINT(ESTALE) );
+	RETURN ( __mkSmallInteger(ESTALE) );
     }
 #endif
 
 #ifdef EREMOTE
     if (sym == @symbol(EREMOTE)) {
-	RETURN ( __MKSMALLINT(EREMOTE) );
+	RETURN ( __mkSmallInteger(EREMOTE) );
     }
 #endif
 
@@ -2670,178 +2670,178 @@
      */
 #ifdef EINPROGRESS
     if (sym == @symbol(EINPROGRESS)) {
-	RETURN ( __MKSMALLINT(EINPROGRESS) );
+	RETURN ( __mkSmallInteger(EINPROGRESS) );
     }
 #endif
 
 #ifdef EALREADY
     if (sym == @symbol(EALREADY)) {
-	RETURN ( __MKSMALLINT(EALREADY) );
+	RETURN ( __mkSmallInteger(EALREADY) );
     }
 #endif
 
 #ifdef ENOTSOCK
     if (sym == @symbol(ENOTSOCK)) {
-	RETURN ( __MKSMALLINT(ENOTSOCK) );
+	RETURN ( __mkSmallInteger(ENOTSOCK) );
     }
 #endif
 
 #ifdef EDESTADDRREQ
     if (sym == @symbol(EDESTADDRREQ)) {
-	RETURN ( __MKSMALLINT(EDESTADDRREQ) );
+	RETURN ( __mkSmallInteger(EDESTADDRREQ) );
     }
 #endif
 
 #ifdef EMSGSIZE
     if (sym == @symbol(EMSGSIZE)) {
-	RETURN ( __MKSMALLINT(EMSGSIZE) );
+	RETURN ( __mkSmallInteger(EMSGSIZE) );
     }
 #endif
 
 #ifdef EPROTOTYPE
     if (sym == @symbol(EPROTOTYPE)) {
-	RETURN ( __MKSMALLINT(EPROTOTYPE) );
+	RETURN ( __mkSmallInteger(EPROTOTYPE) );
     }
 #endif
 
 #ifdef ENOPROTOOPT
     if (sym == @symbol(ENOPROTOOPT)) {
-	RETURN ( __MKSMALLINT(ENOPROTOOPT) );
+	RETURN ( __mkSmallInteger(ENOPROTOOPT) );
     }
 #endif
 
 #ifdef EPROTONOSUPPORT
     if (sym == @symbol(EPROTONOSUPPORT)) {
-	RETURN ( __MKSMALLINT(EPROTONOSUPPORT) );
+	RETURN ( __mkSmallInteger(EPROTONOSUPPORT) );
     }
 #endif
 
 #ifdef ESOCKTNOSUPPORT
     if (sym == @symbol(ESOCKTNOSUPPORT)) {
-	RETURN ( __MKSMALLINT(ESOCKTNOSUPPORT) );
+	RETURN ( __mkSmallInteger(ESOCKTNOSUPPORT) );
     }
 #endif
 
 #ifdef EOPNOTSUPP
     if (sym == @symbol(EOPNOTSUPP)) {
-	RETURN ( __MKSMALLINT(EOPNOTSUPP) );
+	RETURN ( __mkSmallInteger(EOPNOTSUPP) );
     }
 #endif
 
 #ifdef EPFNOSUPPORT
     if (sym == @symbol(EPFNOSUPPORT)) {
-	RETURN ( __MKSMALLINT(EPFNOSUPPORT) );
+	RETURN ( __mkSmallInteger(EPFNOSUPPORT) );
     }
 #endif
 
 #ifdef EAFNOSUPPORT
     if (sym == @symbol(EAFNOSUPPORT)) {
-	RETURN ( __MKSMALLINT(EAFNOSUPPORT) );
+	RETURN ( __mkSmallInteger(EAFNOSUPPORT) );
     }
 #endif
 
 #ifdef EADDRINUSE
     if (sym == @symbol(EADDRINUSE)) {
-	RETURN ( __MKSMALLINT(EADDRINUSE) );
+	RETURN ( __mkSmallInteger(EADDRINUSE) );
     }
 #endif
 
 #ifdef EADDRNOTAVAIL
     if (sym == @symbol(EADDRNOTAVAIL)) {
-	RETURN ( __MKSMALLINT(EADDRNOTAVAIL) );
+	RETURN ( __mkSmallInteger(EADDRNOTAVAIL) );
     }
 #endif
 
 #ifdef ETIMEDOUT
     if (sym == @symbol(ETIMEDOUT)) {
-	RETURN ( __MKSMALLINT(ETIMEDOUT) );
+	RETURN ( __mkSmallInteger(ETIMEDOUT) );
     }
 #endif
 
 #ifdef ECONNREFUSED
     if (sym == @symbol(ECONNREFUSED)) {
-	RETURN ( __MKSMALLINT(ECONNREFUSED) );
+	RETURN ( __mkSmallInteger(ECONNREFUSED) );
     }
 #endif
 
 #ifdef ENETDOWN
     if (sym == @symbol(ENETDOWN)) {
-	RETURN ( __MKSMALLINT(ENETDOWN) );
+	RETURN ( __mkSmallInteger(ENETDOWN) );
     }
 #endif
 
 #ifdef ENETUNREACH
     if (sym == @symbol(ENETUNREACH)) {
-	RETURN ( __MKSMALLINT(ENETUNREACH) );
+	RETURN ( __mkSmallInteger(ENETUNREACH) );
     }
 #endif
 
 #ifdef ENETRESET
     if (sym == @symbol(ENETRESET)) {
-	RETURN ( __MKSMALLINT(ENETRESET) );
+	RETURN ( __mkSmallInteger(ENETRESET) );
     }
 #endif
 
 #ifdef ECONNABORTED
     if (sym == @symbol(ECONNABORTED)) {
-	RETURN ( __MKSMALLINT(ECONNABORTED) );
+	RETURN ( __mkSmallInteger(ECONNABORTED) );
     }
 #endif
 
 #ifdef ECONNRESET
     if (sym == @symbol(ECONNRESET)) {
-	RETURN ( __MKSMALLINT(ECONNRESET) );
+	RETURN ( __mkSmallInteger(ECONNRESET) );
     }
 #endif
 
 #ifdef EISCONN
     if (sym == @symbol(EISCONN)) {
-	RETURN ( __MKSMALLINT(EISCONN) );
+	RETURN ( __mkSmallInteger(EISCONN) );
     }
 #endif
 
 #ifdef ENOTCONN
     if (sym == @symbol(ENOTCONN)) {
-	RETURN ( __MKSMALLINT(ENOTCONN) );
+	RETURN ( __mkSmallInteger(ENOTCONN) );
     }
 #endif
 
 #ifdef ESHUTDOWN
     if (sym == @symbol(ESHUTDOWN)) {
-	RETURN ( __MKSMALLINT(ESHUTDOWN) );
+	RETURN ( __mkSmallInteger(ESHUTDOWN) );
     }
 #endif
 
 #ifdef EHOSTDOWN
     if (sym == @symbol(EHOSTDOWN)) {
-	RETURN ( __MKSMALLINT(EHOSTDOWN) );
+	RETURN ( __mkSmallInteger(EHOSTDOWN) );
     }
 #endif
 
 #ifdef EHOSTUNREACH
     if (sym == @symbol(EHOSTUNREACH)) {
-	RETURN ( __MKSMALLINT(EHOSTUNREACH) );
+	RETURN ( __mkSmallInteger(EHOSTUNREACH) );
     }
 #endif
 
 #ifdef EREMOTEIO
     if (sym == @symbol(EREMOTEIO)) {
-	RETURN ( __MKSMALLINT(EREMOTEIO) );
+	RETURN ( __mkSmallInteger(EREMOTEIO) );
     }
 #endif
 #ifdef EDQUOT
     if (sym == @symbol(EDQUOT)) {
-	RETURN ( __MKSMALLINT(EDQUOT) );
+	RETURN ( __mkSmallInteger(EDQUOT) );
     }
 #endif
 #ifdef ENOMEDIUM
     if (sym == @symbol(ENOMEDIUM)) {
-	RETURN ( __MKSMALLINT(ENOMEDIUM) );
+	RETURN ( __mkSmallInteger(ENOMEDIUM) );
     }
 #endif
 #ifdef EMEDIUMTYPE
     if (sym == @symbol(EMEDIUMTYPE)) {
-	RETURN ( __MKSMALLINT(EMEDIUMTYPE) );
+	RETURN ( __mkSmallInteger(EMEDIUMTYPE) );
     }
 #endif
 
@@ -3134,7 +3134,7 @@
 	    if (id == -1) {
 		RETURN (nil);
 	    } else {
-		RETURN (__MKSMALLINT(id));
+		RETURN (__mkSmallInteger(id));
 	    }
 	}
     }
@@ -3397,9 +3397,9 @@
 
 	nWritten = sendfile(__intVal(outFd), __intVal(inFd), __intVal(startIdx), __intVal(count));
 	if (nWritten < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
-	}
-	RETURN (__MKSMALLINT(nWritten));
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
+	}
+	RETURN (__mkSmallInteger(nWritten));
      }
 #endif
 %}.
@@ -3422,7 +3422,7 @@
 
 	ret = mkdir(__stringVal(aPathName), 0755);
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN (false);
 	}
 	RETURN (true);
@@ -3468,7 +3468,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN (true);
@@ -3500,7 +3500,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN (true);
@@ -3699,7 +3699,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN (true);
@@ -3732,7 +3732,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN (true);
@@ -3771,7 +3771,7 @@
 	}
 #endif
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN (true);
@@ -3834,7 +3834,7 @@
 	    fd = open((char *) __stringVal(aPathName), 2);
 	} while (fd < 0 && errno == EINTR);
 	if (fd < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 
@@ -3844,7 +3844,7 @@
 # endif /* HAS_FTRUNCATE */
 #endif
     if (ret < 0) {
-	@global(LastErrorNumber) = __MKSMALLINT(errno);
+	@global(LastErrorNumber) = __mkSmallInteger(errno);
 	RETURN ( false );
     }
     RETURN (true);
@@ -3879,31 +3879,31 @@
 #   endif
 
     if (aSymbol == @symbol(readUser)) {
-	RETURN ( __MKSMALLINT(S_IRUSR) );
+	RETURN ( __mkSmallInteger(S_IRUSR) );
     }
     if (aSymbol == @symbol(writeUser)) {
-	RETURN ( __MKSMALLINT(S_IWUSR) );
+	RETURN ( __mkSmallInteger(S_IWUSR) );
     }
     if (aSymbol == @symbol(executeUser)) {
-	RETURN ( __MKSMALLINT(S_IXUSR) );
+	RETURN ( __mkSmallInteger(S_IXUSR) );
     }
     if (aSymbol == @symbol(readGroup)) {
-	RETURN ( __MKSMALLINT(S_IRGRP) );
+	RETURN ( __mkSmallInteger(S_IRGRP) );
     }
     if (aSymbol == @symbol(writeGroup)) {
-	RETURN ( __MKSMALLINT(S_IWGRP) );
+	RETURN ( __mkSmallInteger(S_IWGRP) );
     }
     if (aSymbol == @symbol(executeGroup)) {
-	RETURN ( __MKSMALLINT(S_IXGRP) );
+	RETURN ( __mkSmallInteger(S_IXGRP) );
     }
     if (aSymbol == @symbol(readOthers)) {
-	RETURN ( __MKSMALLINT(S_IROTH) );
+	RETURN ( __mkSmallInteger(S_IROTH) );
     }
     if (aSymbol == @symbol(writeOthers)) {
-	RETURN ( __MKSMALLINT(S_IWOTH) );
+	RETURN ( __mkSmallInteger(S_IWOTH) );
     }
     if (aSymbol == @symbol(executeOthers)) {
-	RETURN ( __MKSMALLINT(S_IXOTH) );
+	RETURN ( __mkSmallInteger(S_IXOTH) );
     }
 %}.
     ^ self primitiveFailed
@@ -3940,10 +3940,10 @@
 	__END_INTERRUPTABLE__
 
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( nil );
 	}
-	RETURN ( __MKSMALLINT(buf.st_mode & 0777) );
+	RETURN ( __mkSmallInteger(buf.st_mode & 0777) );
     }
 %}.
    ^ self primitiveFailed
@@ -3969,7 +3969,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN ( true );
@@ -4486,7 +4486,7 @@
     __END_INTERRUPTABLE__
 
     if (ret < 0) {
-	error = __MKSMALLINT(errno);
+	error = __mkSmallInteger(errno);
 	@global(LastErrorNumber) = error;
 	goto out;
     }
@@ -4543,10 +4543,10 @@
     } else {
 	id = __MKUINT(buf.st_ino);
     }
-    mode = __MKSMALLINT(buf.st_mode & 0777);
-    uid = __MKSMALLINT(buf.st_uid);
-    gid = __MKSMALLINT(buf.st_gid);
-    nLink = __MKSMALLINT(buf.st_nlink);
+    mode = __mkSmallInteger(buf.st_mode & 0777);
+    uid = __mkSmallInteger(buf.st_uid);
+    gid = __mkSmallInteger(buf.st_gid);
+    nLink = __mkSmallInteger(buf.st_nlink);
     if (sizeof(buf.st_size) == 8) {
 	size = __MKINT64(&buf.st_size);
     } else {
@@ -4611,7 +4611,7 @@
 	} while ((ret < 0) && (errno == EINTR));
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN ( ((buf.st_mode & S_IFMT) == S_IFDIR) ? true : false);
@@ -4641,7 +4641,7 @@
 	} while ((ret < 0) && (errno == EINTR));
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	}
 	RETURN ( ((ret == 0) ? true : false) );
     }
@@ -4666,7 +4666,7 @@
 	} while ((ret < 0) && (errno == EINTR));
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	}
 	RETURN ( ((ret == 0) ? true : false) );
     }
@@ -4692,7 +4692,7 @@
 	} while ((ret < 0) && (errno == EINTR));
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN (false);
 	}
 	RETURN ( ret ? false : true );
@@ -4721,7 +4721,7 @@
 	} while ((ret < 0) && (errno == EINTR));
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	}
 	RETURN ( ((ret == 0) ? true : false) );
     }
@@ -4776,7 +4776,7 @@
 	__END_INTERRUPTABLE__
 
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( nil );
 	}
 	switch (buf.st_mode & S_IFMT) {
@@ -4784,7 +4784,7 @@
 	    case S_IFLNK:
 		type = @symbol(symbolicLink);
 		if ((ret = readlink((char *) __stringVal(aPathName), pathBuffer, sizeof(pathBuffer))) < 0) {
-		    @global(LastErrorNumber) = __MKSMALLINT(errno);
+		    @global(LastErrorNumber) = __mkSmallInteger(errno);
 		    RETURN ( nil );
 		}
 		pathBuffer[ret] = '\0';  /* readlink does not 0-terminate */
@@ -4838,10 +4838,10 @@
 	} else {
 	    id = __MKUINT(buf.st_ino);
 	}
-	mode = __MKSMALLINT(buf.st_mode & 0777);
-	uid = __MKSMALLINT(buf.st_uid);
-	gid = __MKSMALLINT(buf.st_gid);
-	nLink = __MKSMALLINT(buf.st_nlink);
+	mode = __mkSmallInteger(buf.st_mode & 0777);
+	uid = __mkSmallInteger(buf.st_uid);
+	gid = __mkSmallInteger(buf.st_gid);
+	nLink = __mkSmallInteger(buf.st_nlink);
 	if (sizeof(buf.st_size) == 8) {
 	    size = __MKINT64(&buf.st_size);
 	} else {
@@ -5005,7 +5005,7 @@
 	    retVal = __MKUINT(ino);
 	    RETURN (retVal);
 	}
-	@global(LastErrorNumber) = __MKSMALLINT(errno);
+	@global(LastErrorNumber) = __mkSmallInteger(errno);
 	RETURN (nil);
     }
     RETURN (nil);
@@ -5088,7 +5088,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN (nil);
 	}
 	osSeconds = __MKUINT(buf.st_atime);
@@ -5129,7 +5129,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( nil );
 	}
 	osSeconds = __MKUINT(buf.st_mtime);
@@ -5173,7 +5173,7 @@
 	} while (ret < 0 && errno == EINTR);
 	__END_INTERRUPTABLE__
 	if (ret < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( nil );
 	}
 	switch (buf.st_mode & S_IFMT) {
@@ -5289,7 +5289,7 @@
 	    ret = flags;
 	}
 # endif /* !SYSV4 */
-	RETURN ( __MKSMALLINT(ret) );
+	RETURN ( __mkSmallInteger(ret) );
     }
 #endif
 %}.
@@ -5822,7 +5822,7 @@
 %{
     if (__bothSmallInteger(signalNumber, processId)) {
 	if (kill(__intVal(processId), __intVal(signalNumber)) < 0) {
-	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
 	    RETURN ( false );
 	}
 	RETURN ( true );
@@ -5961,8 +5961,8 @@
 	_fdM -1;
     }
     if ((_fdM >= 0) && (_fdS >= 0)) {
-	 fdM = __MKSMALLINT(_fdM);
-	 fdS = __MKSMALLINT(_fdS);
+	 fdM = __mkSmallInteger(_fdM);
+	 fdS = __mkSmallInteger(_fdS);
     }
 #   define PTY_IS_IMPLEMENTED 1
 #endif /* IRIX5 */
@@ -6004,8 +6004,8 @@
     }
 
     if ((_fdM >= 0) && (_fdS >= 0)) {
-	 fdM = __MKSMALLINT(_fdM);
-	 fdS = __MKSMALLINT(_fdS);
+	 fdM = __mkSmallInteger(_fdM);
+	 fdS = __mkSmallInteger(_fdS);
     }
 #   define PTY_IS_IMPLEMENTED 1
 #endif /* HAS_UNIX98_PTY */
@@ -6112,8 +6112,8 @@
   getOutOfHere: ;
 
     if ((_fdM >= 0) && (_fdS >= 0)) {
-	 fdM = __MKSMALLINT(_fdM);
-	 fdS = __MKSMALLINT(_fdS);
+	 fdM = __mkSmallInteger(_fdM);
+	 fdS = __mkSmallInteger(_fdS);
     }
 
 #endif /* ! defined(PTY_IS_IMPLEMENTED) */
@@ -6138,12 +6138,12 @@
      int fds[2];
 
      if (pipe(fds) < 0) {
-	@global(LastErrorNumber) = __MKSMALLINT(errno);
+	@global(LastErrorNumber) = __mkSmallInteger(errno);
 	RETURN ( nil );
      }
 
-     fd1 = __MKSMALLINT(fds[0]);
-     fd2 = __MKSMALLINT(fds[1]);
+     fd1 = __mkSmallInteger(fds[0]);
+     fd2 = __mkSmallInteger(fds[1]);
 %}.
     fd1 notNil ifTrue:[
 	^ Array with:fd1 with:fd2.
@@ -6583,10 +6583,10 @@
 	__AT_PUT_(info, @symbol(negativeSign), val);
     }
     if (intFractDigits >= 0) {
-	__AT_PUT_(info, @symbol(internationalFractionalDigits),  __MKSMALLINT(intFractDigits));
+	__AT_PUT_(info, @symbol(internationalFractionalDigits),  __mkSmallInteger(intFractDigits));
     }
     if (fractDigits >= 0) {
-	__AT_PUT_(info, @symbol(fractionalDigits),  __MKSMALLINT(fractDigits));
+	__AT_PUT_(info, @symbol(fractionalDigits),  __mkSmallInteger(fractDigits));
     }
     if (csPosPrecedes >= 0) {
 	if (csPosPrecedes == 0) {
@@ -6805,7 +6805,7 @@
     int pid = 0;
 
     pid = getpid();
-    RETURN ( __MKSMALLINT(pid) );
+    RETURN ( __mkSmallInteger(pid) );
 %}
     "
      OperatingSystem getProcessId
@@ -7595,18 +7595,18 @@
      * TODO: new systems provide a query function for this ... use it
      */
 #   if defined(MAXFILENAMELEN)
-      RETURN ( __MKSMALLINT(MAXFILENAMELEN) );
+      RETURN ( __mkSmallInteger(MAXFILENAMELEN) );
 #   else
 #    if defined(BSD) || defined(SYSV4) || defined(LONGFILENAMES)
-      RETURN ( __MKSMALLINT(255) );
+      RETURN ( __mkSmallInteger(255) );
 #    endif
 
 #    ifdef realIX
-       RETURN ( __MKSMALLINT(127) );
+       RETURN ( __mkSmallInteger(127) );
 #    endif
 
 #    ifdef SYSV
-       RETURN ( __MKSMALLINT(14) );
+       RETURN ( __mkSmallInteger(14) );
 #    endif
 #   endif
 %}.
@@ -7640,7 +7640,7 @@
     "return the max number of characters in a pathName."
 
 %{  /* NOCONTEXT */
-    RETURN ( __MKSMALLINT(MAXPATHLEN) );
+    RETURN ( __mkSmallInteger(MAXPATHLEN) );
 %}
     "
      OperatingSystem maxPathLength
@@ -7999,7 +7999,7 @@
 	if (address != (void *)-1) {
 	    RETURN (__MKEXTERNALBYTES(addr));
 	}
-	@global(LastErrorNumber) = __MKSMALLINT(errno);
+	@global(LastErrorNumber) = __mkSmallInteger(errno);
 	RETURN (nil);
     }
 #endif
@@ -8025,7 +8025,7 @@
 	if (rslt != -1) {
 	    RETURN (true);
 	}
-	@global(LastErrorNumber) = __MKSMALLINT(errno);
+	@global(LastErrorNumber) = __mkSmallInteger(errno);
 	RETURN (false);
     }
 #endif
@@ -8048,9 +8048,9 @@
 
 	rslt = shmget(__intVal(key), __intVal(size), __intVal(flags));
 	if (rslt != -1) {
-	    RETURN (__MKSMALLINT(rslt));
-	}
-	@global(LastErrorNumber) = __MKSMALLINT(errno);
+	    RETURN (__mkSmallInteger(rslt));
+	}
+	@global(LastErrorNumber) = __mkSmallInteger(errno);
 	RETURN (nil);
     }
 #endif
@@ -8286,7 +8286,7 @@
 #endif
 
 out:
-    RETURN ( __MKSMALLINT(t & 0x1FFFFFFF) );
+    RETURN ( __mkSmallInteger(t & 0x1FFFFFFF) );
 
 err:;
 %}.
@@ -8373,7 +8373,7 @@
 	ticks = times(&tb);
 	t = (ticks * 1000) / HZ;
 	t = t % 1000;
-	_millis = __MKSMALLINT(t);
+	_millis = __mkSmallInteger(t);
     }
 #   define HAVE_TIME
 #  endif /* OLD SYSV stuff */
@@ -8524,17 +8524,17 @@
     } else {
 	tmPtr = gmtime(&tt);
     }
-    hours = __MKSMALLINT(tmPtr->tm_hour);
-    minutes = __MKSMALLINT(tmPtr->tm_min);
-    seconds = __MKSMALLINT(tmPtr->tm_sec);
-
-    year = __MKSMALLINT(tmPtr->tm_year + 1900);
-    month = __MKSMALLINT(tmPtr->tm_mon + 1);
-    day = __MKSMALLINT(tmPtr->tm_mday);
-
-    yDay = __MKSMALLINT(tmPtr->tm_yday+1);
-    wDay = __MKSMALLINT(tmPtr->tm_wday == 0 ? 7 : tmPtr->tm_wday);
-    utcOffset = __MKSMALLINT(TIMEZONE(tmPtr));
+    hours = __mkSmallInteger(tmPtr->tm_hour);
+    minutes = __mkSmallInteger(tmPtr->tm_min);
+    seconds = __mkSmallInteger(tmPtr->tm_sec);
+
+    year = __mkSmallInteger(tmPtr->tm_year + 1900);
+    month = __mkSmallInteger(tmPtr->tm_mon + 1);
+    day = __mkSmallInteger(tmPtr->tm_mday);
+
+    yDay = __mkSmallInteger(tmPtr->tm_yday+1);
+    wDay = __mkSmallInteger(tmPtr->tm_wday == 0 ? 7 : tmPtr->tm_wday);
+    utcOffset = __mkSmallInteger(TIMEZONE(tmPtr));
     dst = (tmPtr->tm_isdst == 0 ? false : true);
 %}.
     info := self timeInfoClass new.
@@ -8579,7 +8579,7 @@
     int uid;
 
     uid = getegid();
-    RETURN ( __MKSMALLINT(uid) );
+    RETURN ( __mkSmallInteger(uid) );
 %}
 
     "
@@ -8598,7 +8598,7 @@
     int uid;
 
     uid = geteuid();
-    RETURN ( __MKSMALLINT(uid) );
+    RETURN ( __mkSmallInteger(uid) );
 %}
 
     "
@@ -8645,7 +8645,7 @@
     int uid;
 
     uid = getgid();
-    RETURN ( __MKSMALLINT(uid) );
+    RETURN ( __mkSmallInteger(uid) );
 %}.
     ^ 1 "just a dummy for systems which do not have userIDs"
 
@@ -8751,7 +8751,7 @@
     int uid;
 
     uid = getuid();
-    RETURN ( __MKSMALLINT(uid) );
+    RETURN ( __mkSmallInteger(uid) );
 %}
 
     "
@@ -8835,8 +8835,8 @@
 #  endif
 	shell = __MKSTRING(buf->pw_shell);
 
-	uid = __MKSMALLINT(buf->pw_uid);
-	gid = __MKSMALLINT(buf->pw_gid);
+	uid = __mkSmallInteger(buf->pw_uid);
+	gid = __mkSmallInteger(buf->pw_gid);
     }
 # endif /* has PWD */
 %}.
@@ -8975,17 +8975,17 @@
 	if (errno == ECHILD)
 	    RETURN(nil);
     } else {
-	pid = __MKSMALLINT(p);
+	pid = __mkSmallInteger(p);
 	if (WIFEXITED(s)) {
 	    status = @symbol(exit);
-	    code = __MKSMALLINT(WEXITSTATUS(s));
+	    code = __mkSmallInteger(WEXITSTATUS(s));
 	    core = WCOREDUMP(s) ? true : false;
 	} else if (WIFSIGNALED(s)) {
 	    status = @symbol(signal);
-	    code = __MKSMALLINT(WTERMSIG(s));
+	    code = __mkSmallInteger(WTERMSIG(s));
 	} else if (WIFSTOPPED(s)) {
 	    status = @symbol(stop);
-	    code = __MKSMALLINT(WSTOPSIG(s));
+	    code = __mkSmallInteger(WSTOPSIG(s));
 	}
 #if defined(WIFCONTINUED)
 	else if (WIFCONTINUED(s)) {
@@ -9303,21 +9303,21 @@
 	for (i=0; i <= maxF; i++) {
 	    if (FD_ISSET(i, &rset)) {
 		if (cntR < resultSizeReadable) {
-		    __resultR[cntR] = __MKSMALLINT(i);
+		    __resultR[cntR] = __mkSmallInteger(i);
 		}
 		cntR++;
 	    }
 
 	    if (FD_ISSET(i, &wset)) {
 		if (cntW < resultSizeWritable) {
-		    __resultW[cntW] = __MKSMALLINT(i);
+		    __resultW[cntW] = __mkSmallInteger(i);
 		}
 		cntW++;
 	    }
 
 	    if (FD_ISSET(i, &eset)) {
 		if (cntE < resultSizeException) {
-		    __resultE[cntE] = __MKSMALLINT(i);
+		    __resultE[cntE] = __mkSmallInteger(i);
 		}
 		cntE++;
 	    }
@@ -9333,7 +9333,7 @@
 	    __resultE[cntE] = nil;
 	}
 
-	RETURN (__MKSMALLINT(cntR+cntW+cntE));
+	RETURN (__mkSmallInteger(cntR+cntW+cntE));
     } else {
 	if (ret < 0) {
 	    if (errno == EINTR) {
@@ -9343,7 +9343,7 @@
 		if (@global(InfoPrinting) == true) {
 		    fprintf(stderr, "OS [info]: select errno = %d\n", errno);
 		}
-		@global(LastErrorNumber) = __MKSMALLINT(errno);
+		@global(LastErrorNumber) = __mkSmallInteger(errno);
 	    }
 	} else {
 	    @global(LastErrorNumber) = nil;
@@ -9353,7 +9353,7 @@
     /*
      * Return 0 (no filedescriptor ready)
      */
-    RETURN (__MKSMALLINT(0));
+    RETURN (__mkSmallInteger(0));
 fail: ;
 %}.
     "
@@ -9517,7 +9517,7 @@
 		if (FD_ISSET(i, &rset)
 		 || FD_ISSET(i, &wset)
 		 || FD_ISSET(i, &eset)) {
-		    RETURN ( __MKSMALLINT(i) );
+		    RETURN ( __mkSmallInteger(i) );
 		}
 	    }
 	} else {
@@ -9529,7 +9529,7 @@
 		    if (@global(InfoPrinting) == true) {
 			fprintf(stderr, "OS [info]: select errno = %d\n", errno);
 		    }
-		    @global(LastErrorNumber) = __MKSMALLINT(errno);
+		    @global(LastErrorNumber) = __mkSmallInteger(errno);
 		}
 	    } else {
 		@global(LastErrorNumber) = nil;
@@ -10094,9 +10094,9 @@
 	    ret = fcntl(f, F_SETFL, flags | DELAY_FLAG);
 	}
 	if (ret >= 0) {
-	    RETURN(__MKSMALLINT(flags));
+	    RETURN(__mkSmallInteger(flags));
 	} else {
-	    err = __MKSMALLINT(errno);
+	    err = __mkSmallInteger(errno);
 	}
     }
 # undef DELAY_FLAG
@@ -10847,7 +10847,7 @@
     if (__isString(aNameOrNumber) || __isSymbol(aNameOrNumber)) {
 	protoent = getprotobyname((char *) __stringVal(aNameOrNumber));
 	if (protoent) {
-	    protocolCode = __MKSMALLINT(protoent->p_proto);
+	    protocolCode = __mkSmallInteger(protoent->p_proto);
 	    protocolSymbol = __MKSYMBOL(protoent->p_name, 0);
 	}
     }
@@ -11053,10 +11053,10 @@
 
 	__ArrayInstPtr(result)->a_element[cnt] = resp; __STORE(result, resp);
 
-	__ArrayInstPtr(resp)->a_element[0] = __MKSMALLINT(infop->ai_flags);
-	__ArrayInstPtr(resp)->a_element[1] = __MKSMALLINT(infop->ai_family);
-	__ArrayInstPtr(resp)->a_element[2] = __MKSMALLINT(infop->ai_socktype);
-	__ArrayInstPtr(resp)->a_element[3] = __MKSMALLINT(infop->ai_protocol);
+	__ArrayInstPtr(resp)->a_element[0] = __mkSmallInteger(infop->ai_flags);
+	__ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(infop->ai_family);
+	__ArrayInstPtr(resp)->a_element[2] = __mkSmallInteger(infop->ai_socktype);
+	__ArrayInstPtr(resp)->a_element[3] = __mkSmallInteger(infop->ai_protocol);
 
 	__PROTECT__(resp);
 	o = __BYTEARRAY_NEW_INT(infop->ai_addrlen);
@@ -11676,7 +11676,7 @@
 		goto again;
 
 	    default:
-		error = __MKSMALLINT(errno);
+		error = __mkSmallInteger(errno);
 		break;
 	}
     }
@@ -11741,7 +11741,7 @@
 # endif
 
     default:
-	error = __MKSMALLINT(errno);
+	error = __mkSmallInteger(errno);
 	break;
     }
 
@@ -11864,7 +11864,7 @@
 	    __HANDLE_INTERRUPTS__;
 	    goto again;
 	} else {
-	    error = __MKSMALLINT(errno);
+	    error = __mkSmallInteger(errno);
 	    goto err;
 	}
     }
@@ -11988,7 +11988,7 @@
 	    __HANDLE_INTERRUPTS__;
 	    goto again;
 	} else {
-	    error = __MKSMALLINT(errno);
+	    error = __mkSmallInteger(errno);
 	    goto err;
 	}
     }
@@ -12303,7 +12303,7 @@
     sock = __smallIntegerVal(__INST(fd));
     ret = getsockname(sock, (struct sockaddr *)__byteArrayVal(socketAddress), &sockaddr_size);
     if (ret < 0) {
-	error = __MKSMALLINT(errno);
+	error = __mkSmallInteger(errno);
     }
 err:;
 #endif /* NO_SOCKET */
@@ -12355,7 +12355,7 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.230 2005-07-07 15:21:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.231 2005-07-08 17:15:03 cg Exp $'
 ! !
 
 UnixOperatingSystem initialize!