* __scm.h (SCM_ALLOW_INTS_ONLY): Removed.

[bpt/guile.git] / libguile / _scm.h

diff --git a/libguile/_scm.h b/libguile/_scm.h
index 0a1c3f4..3d25f1c 100644 (file)
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -3,7 +3,7 @@
 #ifndef SCM__SCM_H
 #define SCM__SCM_H
 
-/* Copyright (C) 1995,1996,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,2000,2001, 2002 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,6 +46,8 @@
 
 \f
 
+#include <errno.h>
+
 #include "libguile/__scm.h"
 
 /* "What's the difference between _scm.h and __scm.h?"
@@ -72,10 +74,7 @@
 #include "libguile/numbers.h"  /* Everyone deals with fixnums.  */
 #include "libguile/symbols.h"  /* For length, chars, values, miscellany.  */
 #include "libguile/boolean.h"  /* Everyone wonders about the truth.  */
-#ifdef USE_THREADS             
-#include "libguile/threads.h"  /* The cooperative thread package does
-                                  switching at async ticks.  */
-#endif
+#include "libguile/threads.h"  /* You are not alone. */
 #include "libguile/snarf.h"    /* Everyone snarfs. */
 #include "libguile/variable.h"
 #include "libguile/modules.h"
@@ -89,8 +88,11 @@
    */
 
 #ifdef HAVE_RESTARTABLE_SYSCALLS
+#ifndef USE_PTHREAD_THREADS /* However, don't assume SA_RESTART 
+                           works with pthreads... */
 #define SCM_SYSCALL(line) line
 #endif
+#endif
 
 #ifndef SCM_SYSCALL
 #ifdef vms
@@ -125,10 +127,10 @@
 \f
 
 #ifndef min
-#define min(A,B) ((A) <= (B) ? (A) : (B))
+#define min(A, B) ((A) <= (B) ? (A) : (B))
 #endif
 #ifndef max
-#define max(A,B) ((A) >= (B) ? (A) : (B))
+#define max(A, B) ((A) >= (B) ? (A) : (B))
 #endif
 
 #endif  /* SCM__SCM_H */