* scmsigs.h, async.h: updated.

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

diff --git a/libguile/_scm.h b/libguile/_scm.h
index 1c7e74e..d866288 100644 (file)
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -16,7 +16,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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -40,18 +41,53 @@
  *
  * 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.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 
-#include "libguile.h"
+#include "__scm.h"
+
+/* This file is only visible to the libguile sources */
+
+/* Include headers for those files central to the implementation.  The
+   rest should be explicitly #included in the C files themselves.  */
+#include "error.h"             /* Everyone signals errors.  */
+#include "print.h"             /* Everyone needs to print.  */
+#include "pairs.h"             /* Everyone conses.  */
+#include "list.h"              /* Everyone makes lists.  */
+#include "gc.h"                        /* Everyone allocates.  */
+#include "gsubr.h"             /* Everyone defines global functions.  */
+#include "procs.h"             /* Same.  */
+#include "numbers.h"           /* Everyone deals with fixnums.  */
+#include "symbols.h"           /* For length, chars, values, miscellany.  */
+#include "boolean.h"           /* Everyone wonders about the truth.  */
+#include "strings.h"           /* Everyone loves string.  */
+#include "vectors.h"           /* Vectors are used for structures a lot.  */
+#include "root.h"              /* Everyone uses these objects.  */
+#include "ports.h"             /* Everyone does I/O.  */
+#include "async.h"             /* Everyone allows/disallows ints.  */
+#ifdef USE_THREADS
+#include "threads.h"           /* The cooperative thread package does
+                                  switching at async ticks.  */
+#endif
+#include "snarf.h"             /* Everyone snarfs. */
 
 /* On VMS, GNU C's errno.h contains a special hack to get link attributes
  * for errno correct for linking to the C RTL.
  */
 #include <errno.h>
 
-/* SCM_SYSCALL retries system calls that have been interrupted (EINTR) */
+/* SCM_SYSCALL retries system calls that have been interrupted (EINTR).
+   However this can be avoided if the operating system can restart
+   system calls automatically.  We assume this is the case if
+   sigaction is available and SA_RESTART is defined; they will be used
+   when installing signal handlers.
+   */
+
+#ifdef HAVE_RESTARTS
+#define SCM_SYSCALL(line) line
+#endif
+
+#ifndef SCM_SYSCALL
 #ifdef vms
 # ifndef __GNUC__
 #  include <ssdef.h>
@@ -59,6 +95,7 @@
        while(EVMSERR==errno && (vaxc$errno>>3)==(SS$_CONTROLC>>3))
 # endif /* ndef __GNUC__ */
 #endif /* def vms */
+#endif /* ndef SCM_SYSCALL  */
 
 #ifndef SCM_SYSCALL
 # ifdef EINTR
@@ -69,7 +106,7 @@
 #endif /* ndef SCM_SYSCALL */
 
 #ifndef SCM_SYSCALL
-# define SCM_SYSCALL(line) {line;}
+# define SCM_SYSCALL(line) line;
 #endif /* ndef SCM_SYSCALL */
 
 #ifndef MSDOS
@@ -88,42 +125,11 @@
 
 \f
 
-#ifndef SCM_MAGIC_SNARFER
-#define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
-       static char RANAME[]=STR;
-#define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
-       static char RANAME[]=STR;
-#else
-#define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
-%%%    scm_make_gsubr (RANAME, REQ, OPT, VAR, CFN)
-#define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
-%%%    scm_make_subr(RANAME, TYPE, CFN)
+#ifndef min
+#define min(A,B) ((A) <= (B) ? (A) : (B))
 #endif
-
-#ifndef SCM_MAGIC_SNARFER
-#define SCM_SYMBOL(c_name, scheme_name) \
-       static SCM c_name = SCM_BOOL_F
-#else
-#define SCM_SYMBOL(C_NAME, SCHEME_NAME) \
-%%%    C_NAME = scm_permanent_object (SCM_CAR (scm_intern0 (SCHEME_NAME)))
-#endif
-
-
-#ifndef SCM_MAGIC_SNARFER
-#define SCM_GLOBAL(c_name, scheme_name) \
-       static SCM c_name = SCM_BOOL_F
-#else
-#define SCM_GLOBAL(C_NAME, SCHEME_NAME) \
-%%%    C_NAME = scm_permanent_object (scm_intern0 (SCHEME_NAME)); SCM_SETCDR (C_NAME, SCM_BOOL_F)
-#endif
-
-
-#ifndef SCM_MAGIC_SNARFER
-#define SCM_CONST_LONG(C_NAME, SCHEME_NAME,VALUE) \
-       static SCM C_NAME = SCM_BOOL_F
-#else
-#define SCM_CONST_LONG(C_NAME, SCHEME_NAME,VALUE) \
-%%%    C_NAME = scm_permanent_object (scm_intern0 (SCHEME_NAME)); SCM_SETCDR (C_NAME, scm_long2num (VALUE))
+#ifndef max
+#define max(A,B) ((A) >= (B) ? (A) : (B))
 #endif
 
 #endif  /* _SCMH */