Changed license terms to the plain LGPL thru-out.

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

diff --git a/libguile/root.h b/libguile/root.h
index 7b0fb2a..d3b6239 100644 (file)
--- a/libguile/root.h
+++ b/libguile/root.h
@@ -3,46 +3,22 @@
 #ifndef SCM_ROOT_H
 #define SCM_ROOT_H
 
-/* Copyright (C) 1996,1998,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1998,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 library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser 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,
- * 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.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * 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.  */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 
 \f
 
@@ -106,6 +82,15 @@ typedef struct scm_root_state
 
   SCM handle;                  /* The root object for this root state */
   SCM parent;                  /* The parent root object */
+
+  SCM active_asyncs;            /* The thunks to be run at the next
+                                   safe point */
+  SCM signal_asyncs;            /* The pre-queued cells for signal handlers.
+                                 */
+  unsigned int block_asyncs;    /* Non-zero means that asyncs should 
+                                   not be run. */
+  unsigned int pending_asyncs;  /* Non-zero means that asyncs might be pending.
+                                */
 } scm_root_state;
 
 #define scm_stack_base                 (scm_root->stack_base)
@@ -115,22 +100,15 @@ typedef struct scm_root_state
 #define scm_rootcont                   (scm_root->rootcont)
 #define scm_dynwinds                   (scm_root->dynwinds)
 #define scm_progargs                   (scm_root->progargs)
-#ifdef USE_THREADS
 #define scm_last_debug_frame           (scm_root->last_debug_frame)
-#endif
 #define scm_exitval                    (scm_root->exitval)
 #define scm_cur_inp                    (scm_root->cur_inp)
 #define scm_cur_outp                   (scm_root->cur_outp)
 #define scm_cur_errp                   (scm_root->cur_errp)
 #define scm_cur_loadp                  (scm_root->cur_loadp)
-     
-#ifdef USE_THREADS
-#define scm_root ((scm_root_state *) SCM_THREAD_LOCAL_DATA)
-#define scm_set_root(new_root) SCM_SET_THREAD_LOCAL_DATA (new_root)
-#else /* USE_THREADS */
-SCM_API struct scm_root_state *scm_root;
-#define scm_set_root(new_root) (scm_root = (new_root))
-#endif /* USE_THREADS */
+
+#define scm_root                ((scm_root_state *) SCM_THREAD_LOCAL_DATA)
+#define scm_set_root(new_root)  SCM_SET_THREAD_LOCAL_DATA (new_root)
 
 \f