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/modsupport.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/modsupport.h')
-rw-r--r-- | Include/modsupport.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/Include/modsupport.h b/Include/modsupport.h index f476f13..a1f3f1c 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.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 @@ -30,22 +30,29 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Module support interface */ -#ifdef HAVE_PROTOTYPES -#define USE_STDARG -#endif +#ifdef HAVE_STDARG_PROTOTYPES -#ifdef USE_STDARG #include <stdarg.h> + +extern int getargs PROTO((object *, char *, ...)); +extern object *mkvalue PROTO((char *, ...)); + #else + #include <varargs.h> + +/* Better to have no prototypes at all for varargs functions in this case */ +extern int getargs(); +extern object *mkvalue(); + #endif -extern object *initmodule PROTO((char *, struct methodlist *)); -extern int getargs PROTO((object *, char *, ...)); extern int vgetargs PROTO((object *, char *, va_list)); -extern object *mkvalue PROTO((char *, ...)); extern object *vmkvalue PROTO((char *, va_list)); +extern object *initmodule PROTO((char *, struct methodlist *)); +extern object *initmodule2 PROTO((char *, struct methodlist *, object *)); + /* The following are obsolete -- use getargs directly! */ #define getnoarg(v) getargs(v, "") #define getintarg(v, a) getargs(v, "i", a) |