summaryrefslogtreecommitdiff
path: root/libguile/error.c
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/error.c')
-rw-r--r--libguile/error.c84
1 files changed, 37 insertions, 47 deletions
diff --git a/libguile/error.c b/libguile/error.c
index 7a8657846..aa45aec27 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1995-1998, 2000, 2001, 2004, 2006, 2010, 2012-2016,
- * 2018 Free Software Foundation, Inc.
- *
- * 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 3 of
- * the License, or (at your option) any later version.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
+/* Copyright 1995-1998,2000-2001,2004,2006,2010,2012-2016,2018-2019
+ Free Software Foundation, Inc.
+
+ This file is part of Guile.
+
+ Guile 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 3 of the License, or
+ (at your option) any later version.
+
+ Guile 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 Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with Guile. If not, see
+ <https://www.gnu.org/licenses/>. */
@@ -24,28 +24,31 @@
# include <config.h>
#endif
-#include <stdlib.h>
-#include <stdio.h>
#include <errno.h>
-
-#include "libguile/_scm.h"
-#include "libguile/dynwind.h"
-#include "libguile/pairs.h"
-#include "libguile/strings.h"
-#include "libguile/throw.h"
-
-#include "libguile/validate.h"
-#include "libguile/error.h"
-
-#ifdef HAVE_STRING_H
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#endif
#include <unistd.h>
/* For Windows... */
#ifdef HAVE_IO_H
#include <io.h>
#endif
+
+#include "async.h"
+#include "dynwind.h"
+#include "gsubr.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "strings.h"
+#include "symbols.h"
+#include "throw.h"
+
+#include "error.h"
+
+
/* {Errors and Exceptional Conditions}
@@ -84,13 +87,6 @@ SCM_DEFINE (scm_error_scm, "scm-error", 5, 0, 0,
"it will usually be @code{#f}.")
#define FUNC_NAME s_scm_error_scm
{
- if (scm_gc_running_p)
- {
- /* The error occured during GC --- abort */
- fprintf (stderr, "Guile: error during GC.\n"),
- abort ();
- }
-
scm_ithrow (key, scm_list_4 (subr, message, args, data), 1);
/* No return, but just in case: */
@@ -302,13 +298,7 @@ scm_misc_error (const char *subr, const char *message, SCM args)
void
scm_init_error ()
{
-#include "libguile/cpp-E.c"
-#include "libguile/error.x"
+#include "cpp-E.c"
+#include "error.x"
}
-
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/