diff options
| author | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 +0000 |
| commit | 31bcad2a833517df724fc6ca8335190170174b8f (patch) | |
| tree | 4467846eced619192a031837d76b2186f28a395f /Include/pyerrors.h | |
| parent | c660f7fcd25eb9d5c9ce72899c5f4a66141136d8 (diff) | |
| download | cpython-31bcad2a833517df724fc6ca8335190170174b8f.tar.gz | |
Merge alpha100 branch back to main trunk
Diffstat (limited to 'Include/pyerrors.h')
| -rw-r--r-- | Include/pyerrors.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h index 2444ee193e..050ff192f2 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -5,7 +5,7 @@ extern "C" { #endif /*********************************************************** -Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum, +Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands. All Rights Reserved @@ -33,7 +33,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. void err_set PROTO((object *)); void err_setval PROTO((object *, object *)); void err_setstr PROTO((object *, char *)); -int err_occurred PROTO((void)); +object *err_occurred PROTO((void)); void err_get PROTO((object **, object **)); void err_clear PROTO((void)); @@ -64,12 +64,13 @@ extern object *ZeroDivisionError; extern int err_badarg PROTO((void)); extern object *err_nomem PROTO((void)); extern object *err_errno PROTO((object *)); -extern void err_input PROTO((int)); extern void err_badcall PROTO((void)); extern object *err_getexc PROTO((void)); +extern int sigcheck PROTO((void)); /* In sigcheck.c or signalmodule.c */ + #ifdef __cplusplus } #endif |