Mercurial > cpython-lru_cache-weakref
diff Include/pyerrors.h @ 1746:1940892d2fe3 legacy-trunk
Merge alpha100 branch back to main trunk
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Mon, 01 Aug 1994 11:34:53 +0000 |
| parents | 519c25039c6a |
| children | 9b530bb54642 |
line wrap: on
line diff
--- a/Include/pyerrors.h Mon Aug 01 11:18:30 1994 +0000 +++ b/Include/pyerrors.h Mon Aug 01 11:34:53 1994 +0000 @@ -5,7 +5,7 @@ #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 @@ 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 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
