X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/82892beda5c053715bc3ec7063af4a129f52c5f9..9e57344b1d19957afcaefadb8b30e0e9070e894a:/libguile/error.h

diff --git a/libguile/error.h b/libguile/error.h
index 839a30eb7..1c10fd8c3 100644
--- a/libguile/error.h
+++ b/libguile/error.h
@@ -2,7 +2,7 @@
 
 #ifndef ERRORH
 #define ERRORH
-/*	Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+/*	Copyright (C) 1995,1996,1997,1998, 2000 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
@@ -59,25 +59,42 @@ extern int scm_ints_disabled;
 #define SCM_NORETURN
 #endif
 
-extern void scm_error SCM_P ((SCM key, char *subr, char *message,
-			      SCM args, SCM rest)) SCM_NORETURN;
-extern void (*scm_error_callback) SCM_P ((SCM key, char *subr,
-					  char *message, SCM args, SCM rest));
-extern SCM scm_error_scm SCM_P ((SCM key, SCM subr, SCM message,
-			      SCM args, SCM rest)) SCM_NORETURN;
-extern void scm_syserror SCM_P ((char *subr)) SCM_NORETURN;
-extern void scm_syserror_msg SCM_P ((char *subr, char *message, SCM args,
-				     int eno)) SCM_NORETURN;
-extern void scm_sysmissing SCM_P ((char *subr)) SCM_NORETURN;
-extern void scm_num_overflow SCM_P ((char *subr)) SCM_NORETURN;
-extern void scm_out_of_range SCM_P ((char *subr, SCM bad_value)) SCM_NORETURN;
-extern void scm_wrong_num_args SCM_P ((SCM proc)) SCM_NORETURN;
-extern void scm_wrong_type_arg SCM_P ((char *subr, int pos, SCM bad_value))
-                                     SCM_NORETURN;
-extern void scm_memory_error SCM_P ((char *subr)) SCM_NORETURN;
-extern void scm_misc_error SCM_P ((char *subr, char *message, SCM args))
-				 SCM_NORETURN;
-extern SCM scm_wta SCM_P ((SCM arg, char *pos, char *s_subr));
-extern void scm_init_error SCM_P ((void));
+extern void scm_error (SCM key, const char *subr, const char *message,
+                             SCM args, SCM rest) SCM_NORETURN;
+extern SCM scm_error_scm (SCM key, SCM subr, SCM message,
+                          SCM args, SCM rest) SCM_NORETURN;
+extern SCM scm_strerror (SCM err);
+extern void scm_syserror (const char *subr) SCM_NORETURN;
+extern void scm_syserror_msg (const char *subr, const char *message,
+                              SCM args, int eno) SCM_NORETURN;
+extern void scm_num_overflow (const char *subr) SCM_NORETURN;
+extern void scm_out_of_range (const char *subr, SCM bad_value)
+     SCM_NORETURN;
+extern void scm_out_of_range_pos (const char *subr, SCM bad_value, SCM pos)
+     SCM_NORETURN;
+extern void scm_wrong_num_args (SCM proc) SCM_NORETURN;
+extern void scm_wrong_type_arg (const char *subr, int pos,
+                                SCM bad_value) SCM_NORETURN;
+extern void scm_wrong_type_arg_msg (const char *subr, int pos,
+                                    SCM bad_value, const char *sz) SCM_NORETURN;
+extern void scm_memory_error (const char *subr) SCM_NORETURN;
+extern void scm_misc_error (const char *subr, const char *message,
+                            SCM args) SCM_NORETURN;
+extern SCM scm_wta (SCM arg, const char *pos, const char *s_subr);
+extern void scm_init_error (void);
+
+
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+
+extern void scm_sysmissing (const char *subr) SCM_NORETURN;
+
+#endif  /* SCM_DEBUG_DEPRECATED == 0 */
 
 #endif  /* ERRORH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/