diff options
author | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 (GMT) |
commit | b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af (patch) | |
tree | 9362939305b2d088b8f19a530c9015d886bc2801 /Include/ceval.h | |
parent | 2979b01ff88ac4c5b316d9bf98edbaaaffac8e24 (diff) | |
download | cpython-b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af.zip cpython-b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af.tar.gz cpython-b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af.tar.bz2 |
Merge alpha100 branch back to main trunk
Diffstat (limited to 'Include/ceval.h')
-rw-r--r-- | Include/ceval.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Include/ceval.h b/Include/ceval.h index 1c830c3..3b16085 100644 --- a/Include/ceval.h +++ b/Include/ceval.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 @@ -35,6 +35,7 @@ object *call_object PROTO((object *, object *)); object *getglobals PROTO((void)); object *getlocals PROTO((void)); object *getowner PROTO((void)); +object *getframe PROTO((void)); void printtraceback PROTO((object *)); void flushline PROTO((void)); @@ -87,7 +88,7 @@ extern void init_save_thread PROTO((void)); extern object *save_thread PROTO((void)); extern void restore_thread PROTO((object *)); -#ifdef USE_THREAD +#ifdef WITH_THREAD #define BGN_SAVE { \ object *_save; \ @@ -97,14 +98,14 @@ extern void restore_thread PROTO((object *)); #define END_SAVE restore_thread(_save); \ } -#else /* !USE_THREAD */ +#else /* !WITH_THREAD */ #define BGN_SAVE { #define RET_SAVE #define RES_SAVE #define END_SAVE } -#endif /* !USE_THREAD */ +#endif /* !WITH_THREAD */ #ifdef __cplusplus } |