* __scm.h (SCM_ALLOW_INTS_ONLY): Removed.

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

diff --git a/libguile/_scm.h b/libguile/_scm.h
index d155f94..3d25f1c 100644 (file)
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef _SCMH
-#define _SCMH
-/*     Copyright (C) 1995,1996, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM__SCM_H
+#define SCM__SCM_H
+
+/* 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
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
@@ -42,8 +43,11 @@
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
+
 \f
 
+#include <errno.h>
+
 #include "libguile/__scm.h"
 
 /* "What's the difference between _scm.h and __scm.h?"
@@ -70,13 +74,11 @@
 #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"
+#include "libguile/inline.h"
 
 /* SCM_SYSCALL retries system calls that have been interrupted (EINTR).
    However this can be avoided if the operating system can restart
@@ -86,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
@@ -122,14 +127,13 @@
 \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  /* _SCMH */
-
+#endif  /* SCM__SCM_H */
 
 /*
   Local Variables: