("sweep_card"): don't count scm_tc_free_cell for

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

diff --git a/libguile/_scm.h b/libguile/_scm.h
index 7fedd5c..a750d6b 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
@@ -17,8 +17,8 @@
  *
  * 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,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -46,19 +46,21 @@
 
 \f
 
-#include "libguile/__scm.h"
-
-/* "What's the difference between _scm.h and __scm.h?"
+/**********************************************************************
+ This file is Guile's central private header.
 
-   _scm.h is not installed; it's only visible to the libguile sources
-   themselves.
+ When included by other files, this file should preceed any include
+ other than __scm.h.  See __scm.h for details regarding the purpose of
+ and differences between _scm.h and __scm.h.
+ **********************************************************************/
 
-   __scm.h is installed, and is #included by <libguile.h>.  If both
-   the client and libguile need some piece of information, and it
-   doesn't fit well into the header file for any particular module, it
-   should go in __scm.h.  */
 
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
+#include <errno.h>
+#include "libguile/__scm.h"
 
 /* Include headers for those files central to the implementation.  The
    rest should be explicitly #included in the C files themselves.  */
@@ -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
+#if ! SCM_USE_PTHREAD_THREADS /* However, don't assume SA_RESTART 
+                                 works with pthreads... */
 #define SCM_SYSCALL(line) line
 #endif
+#endif
 
 #ifndef SCM_SYSCALL
 #ifdef vms