Import Debian changes 5d9-4.1debian/5d9-4.1

scm (5d9-4.1) unstable; urgency=high

  * Non-maintainer upload.
  * High-urgency upload for sarge-targetted RC bugfix.
  * Revert upstream "CAUTIOUS" define, which causes the scm build to
    fail its test suite on alpha (and, it appears, powerpc as well).
    Closes: #245810.

scm (5d9-4) unstable; urgency=low

  * Apply patch from 144062 to fix hppa build (Closes: #144062)
  * Change scm.1 section from Jan 4 200 to 1. (lintian)

scm (5d9-3) unstable; urgency=low

  * Properly clean up info files.
  * Make and install Xlibscm.info.

scm (5d9-2) unstable; urgency=low

  * Fix path problem in slibcat.  Hack at mklibcat.scm.  (Closes: #241510)

scm (5d9-1) unstable; urgency=low

  * New upstream release
  * Merge NMU sparc changes (Closes: #191171, #191356)
  * SHORT_INT is defined for ia64 upstream (Closes: #141928)
  * Scheme imps now grouped in info file (has been for a while)
  (Closes: #115452)

1 files changed, 12 insertions, 9 deletions

diff --git a/unix.c b/unix.c
index 3cfc809..ccd24c7 100644
--- a/unix.c
+++ b/unix.c
@@ -69,6 +69,9 @@ SCM scm_lstat P((SCM str));
 # ifdef SVR4
 #  include <unistd.h>
 # endif
+# ifdef __NetBSD__
+#  include <unistd.h>
+# endif
 # ifdef __OpenBSD__
 #  include <unistd.h>
 # endif
@@ -82,9 +85,9 @@ SCM scm_mknod(path, mode, dev)
      SCM path, mode, dev;
 {
   int val;
-  ASSERT(NIMP(path) && STRINGP(path), path, ARG1, s_mknod);
-  ASSERT(INUMP(mode), mode, ARG2, s_mknod);
-  ASSERT(INUMP(dev), dev, ARG3, s_mknod);
+  ASRTER(NIMP(path) && STRINGP(path), path, ARG1, s_mknod);
+  ASRTER(INUMP(mode), mode, ARG2, s_mknod);
+  ASRTER(INUMP(dev), dev, ARG3, s_mknod);
   SYSCALL(val = mknod(CHARS(path), INUM(mode), INUM(dev)););
   return val ? BOOL_F : BOOL_T;
 }
@@ -97,7 +100,7 @@ SCM scm_acct(path)
     SYSCALL(val = acct(0););
     return val ? BOOL_F : BOOL_T;
   }
-  ASSERT(NIMP(path) && STRINGP(path), path, ARG1, s_acct);
+  ASRTER(NIMP(path) && STRINGP(path), path, ARG1, s_acct);
   SYSCALL(val = acct(CHARS(path)););
   return val ? BOOL_F : BOOL_T;
 }
@@ -106,7 +109,7 @@ static char s_nice[] = "nice";
 SCM scm_nice(incr)
      SCM incr;
 {
-  ASSERT(INUMP(incr), incr, ARG1, s_nice);
+  ASRTER(INUMP(incr), incr, ARG1, s_nice);
   return nice(INUM(incr)) ? BOOL_F : BOOL_T;
 }
 
@@ -121,8 +124,8 @@ SCM scm_symlink(oldpath, newpath)
      SCM oldpath, newpath;
 {
   int val;
-  ASSERT(NIMP(oldpath) && STRINGP(oldpath), oldpath, ARG1, s_symlink);
-  ASSERT(NIMP(newpath) && STRINGP(newpath), newpath, ARG2, s_symlink);
+  ASRTER(NIMP(oldpath) && STRINGP(oldpath), oldpath, ARG1, s_symlink);
+  ASRTER(NIMP(newpath) && STRINGP(newpath), newpath, ARG2, s_symlink);
   SYSCALL(val = symlink(CHARS(oldpath), CHARS(newpath)););
   return val ? BOOL_F : BOOL_T;
 }
@@ -132,7 +135,7 @@ SCM scm_readlink(path)
 {
   int i;
   char buf[1024];
-  ASSERT(NIMP(path) && STRINGP(path), path, ARG1, s_readlink);
+  ASRTER(NIMP(path) && STRINGP(path), path, ARG1, s_readlink);
   SYSCALL(i = readlink(CHARS(path), buf, (sizet)sizeof(buf)););
   if (-1==i) return BOOL_F;
   return makfromstr(buf, (sizet)i);
@@ -143,7 +146,7 @@ SCM scm_lstat(str)
 {
   int i;
   struct stat stat_temp;
-  ASSERT(NIMP(str) && STRINGP(str), str, ARG1, s_lstat);
+  ASRTER(NIMP(str) && STRINGP(str), str, ARG1, s_lstat);
   SYSCALL(i = lstat(CHARS(str), &stat_temp););
   if (i) return BOOL_F;
   return stat2scm(&stat_temp);