X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/003d1fd0462541a64f24c58c55ae71af5afd67d4..e50186ab08383002122e51b277898f3b8cb6cc75:/libguile/_scm.h

diff --git a/libguile/_scm.h b/libguile/_scm.h
index 34b7a720d..42870e787 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef _SCMH
-#define _SCMH
-/*	Copyright (C) 1995,1996, 2000 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,9 +43,12 @@
  * 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.  */
+
 
 
-#include "__scm.h"
+#include <errno.h>
+
+#include "libguile/__scm.h"
 
 /* "What's the difference between _scm.h and __scm.h?"
 
@@ -60,30 +64,21 @@
 
 /* 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 "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>
+#include "libguile/error.h"	/* Everyone signals errors.  */
+#include "libguile/print.h"	/* Everyone needs to print.  */
+#include "libguile/pairs.h"	/* Everyone conses.  */
+#include "libguile/list.h"	/* Everyone makes lists.  */
+#include "libguile/gc.h"	/* Everyone allocates.  */
+#include "libguile/gsubr.h"	/* Everyone defines global functions.  */
+#include "libguile/procs.h"	/* Same.  */
+#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.  */
+#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
@@ -93,8 +88,11 @@
    */
 
 #ifdef HAVE_RESTARTABLE_SYSCALLS
+#ifndef USE_COPT_THREADS /* However, don't assume SA_RESTART 
+			    works with pthreads... */
 #define SCM_SYSCALL(line) line
 #endif
+#endif
 
 #ifndef SCM_SYSCALL
 #ifdef vms
@@ -118,28 +116,27 @@
 # define SCM_SYSCALL(line) line;
 #endif /* ndef SCM_SYSCALL */
 
-#ifndef MSDOS
+#if !defined (MSDOS) && !defined (__MINGW32__)
 # ifdef ARM_ULIB
     extern volatile int errno;
 # else
     extern int errno;
 # endif /* def ARM_ULIB */
-#endif /* ndef MSDOS */
-#ifdef __TURBOC__
-# if (__TURBOC__==1)
- /* Needed for TURBOC V1.0 */
- extern int errno;
-# endif /*  (__TURBOC__==1) */
-#endif /* def __TURBOC__ */
+#endif /* ndef MSDOS && ndef __MINGW32__*/
 
 
 
 #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:
+  c-file-style: "gnu"
+  End:
+*/