[Python-checkins] CVS: python/dist/src/Include modsupport.h,2.30,2.31 pyerrors.h,2.37,2.38
Fred L. Drake
python-dev@python.org
Sat, 8 Jul 2000 10:25:57 -0700
Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13980
Modified Files:
modsupport.h pyerrors.h
Log Message:
ANSI-fication of the sources -- remove Py_PROTO!
Index: modsupport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/modsupport.h,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** modsupport.h 2000/06/30 23:58:04 2.30
--- modsupport.h 2000/07/08 17:25:54 2.31
***************
*** 1,8 ****
- #ifndef Py_MODSUPPORT_H
- #define Py_MODSUPPORT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
-
/***********************************************************
Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 15,18 ****
--- 9,18 ----
******************************************************************/
+ #ifndef Py_MODSUPPORT_H
+ #define Py_MODSUPPORT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
/* Module support interface */
***************
*** 21,29 ****
#include <stdarg.h>
! extern DL_IMPORT(int) PyArg_Parse Py_PROTO((PyObject *, char *, ...));
! extern DL_IMPORT(int) PyArg_ParseTuple Py_PROTO((PyObject *, char *, ...));
! extern DL_IMPORT(int) PyArg_ParseTupleAndKeywords Py_PROTO((PyObject *, PyObject *,
! char *, char **, ...));
! extern DL_IMPORT(PyObject *) Py_BuildValue Py_PROTO((char *, ...));
#else
--- 21,29 ----
#include <stdarg.h>
! extern DL_IMPORT(int) PyArg_Parse(PyObject *, char *, ...);
! extern DL_IMPORT(int) PyArg_ParseTuple(PyObject *, char *, ...);
! extern DL_IMPORT(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
! char *, char **, ...);
! extern DL_IMPORT(PyObject *) Py_BuildValue(char *, ...);
#else
***************
*** 38,43 ****
#endif
! extern DL_IMPORT(int) PyArg_VaParse Py_PROTO((PyObject *, char *, va_list));
! extern DL_IMPORT(PyObject *) Py_VaBuildValue Py_PROTO((char *, va_list));
#define PYTHON_API_VERSION 1009
--- 38,43 ----
#endif
! extern DL_IMPORT(int) PyArg_VaParse(PyObject *, char *, va_list);
! extern DL_IMPORT(PyObject *) Py_VaBuildValue(char *, va_list);
#define PYTHON_API_VERSION 1009
***************
*** 90,96 ****
#define Py_InitModule4 Py_InitModule4TraceRefs
#endif
- extern DL_IMPORT(PyObject *) Py_InitModule4 Py_PROTO((char *, PyMethodDef *,
- char *, PyObject *, int));
#define Py_InitModule(name, methods) \
Py_InitModule4(name, methods, (char *)NULL, (PyObject *)NULL, \
--- 90,98 ----
#define Py_InitModule4 Py_InitModule4TraceRefs
#endif
+
+ extern DL_IMPORT(PyObject *) Py_InitModule4(char *name, PyMethodDef *methods,
+ char *doc, PyObject *self,
+ int apiver);
#define Py_InitModule(name, methods) \
Py_InitModule4(name, methods, (char *)NULL, (PyObject *)NULL, \
Index: pyerrors.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyerrors.h,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** pyerrors.h 2000/06/30 23:58:04 2.37
--- pyerrors.h 2000/07/08 17:25:55 2.38
***************
*** 17,32 ****
/* Error handling definitions */
! DL_IMPORT(void) PyErr_SetNone Py_PROTO((PyObject *));
! DL_IMPORT(void) PyErr_SetObject Py_PROTO((PyObject *, PyObject *));
! DL_IMPORT(void) PyErr_SetString Py_PROTO((PyObject *, const char *));
! DL_IMPORT(PyObject *) PyErr_Occurred Py_PROTO((void));
! DL_IMPORT(void) PyErr_Clear Py_PROTO((void));
! DL_IMPORT(void) PyErr_Fetch Py_PROTO((PyObject **, PyObject **, PyObject **));
! DL_IMPORT(void) PyErr_Restore Py_PROTO((PyObject *, PyObject *, PyObject *));
/* Error testing and normalization */
! DL_IMPORT(int) PyErr_GivenExceptionMatches Py_PROTO((PyObject *, PyObject *));
! DL_IMPORT(int) PyErr_ExceptionMatches Py_PROTO((PyObject *));
! DL_IMPORT(void) PyErr_NormalizeException Py_PROTO((PyObject**, PyObject**, PyObject**));
--- 17,32 ----
/* Error handling definitions */
! DL_IMPORT(void) PyErr_SetNone(PyObject *);
! DL_IMPORT(void) PyErr_SetObject(PyObject *, PyObject *);
! DL_IMPORT(void) PyErr_SetString(PyObject *, const char *);
! DL_IMPORT(PyObject *) PyErr_Occurred(void);
! DL_IMPORT(void) PyErr_Clear(void);
! DL_IMPORT(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
! DL_IMPORT(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
/* Error testing and normalization */
! DL_IMPORT(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *);
! DL_IMPORT(int) PyErr_ExceptionMatches(PyObject *);
! DL_IMPORT(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
***************
*** 55,58 ****
--- 55,60 ----
extern DL_IMPORT(PyObject *) PyExc_NotImplementedError;
extern DL_IMPORT(PyObject *) PyExc_SyntaxError;
+ extern DL_IMPORT(PyObject *) PyExc_IndentationError;
+ extern DL_IMPORT(PyObject *) PyExc_TabError;
extern DL_IMPORT(PyObject *) PyExc_SystemError;
extern DL_IMPORT(PyObject *) PyExc_SystemExit;
***************
*** 71,79 ****
/* Convenience functions */
! extern DL_IMPORT(int) PyErr_BadArgument Py_PROTO((void));
! extern DL_IMPORT(PyObject *) PyErr_NoMemory Py_PROTO((void));
! extern DL_IMPORT(PyObject *) PyErr_SetFromErrno Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename Py_PROTO((PyObject *, char *));
! extern DL_IMPORT(PyObject *) PyErr_Format Py_PROTO((PyObject *, const char *, ...));
#ifdef MS_WINDOWS
extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErrWithFilename(int, const char *);
--- 73,81 ----
/* Convenience functions */
! extern DL_IMPORT(int) PyErr_BadArgument(void);
! extern DL_IMPORT(PyObject *) PyErr_NoMemory(void);
! extern DL_IMPORT(PyObject *) PyErr_SetFromErrno(PyObject *);
! extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename(PyObject *, char *);
! extern DL_IMPORT(PyObject *) PyErr_Format(PyObject *, const char *, ...);
#ifdef MS_WINDOWS
extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErrWithFilename(int, const char *);
***************
*** 81,93 ****
#endif
! extern DL_IMPORT(void) PyErr_BadInternalCall Py_PROTO((void));
/* Function to create a new exception */
! DL_IMPORT(PyObject *) PyErr_NewException Py_PROTO((char *name, PyObject *base,
! PyObject *dict));
/* In sigcheck.c or signalmodule.c */
! extern DL_IMPORT(int) PyErr_CheckSignals Py_PROTO((void));
! extern DL_IMPORT(void) PyErr_SetInterrupt Py_PROTO((void));
--- 83,95 ----
#endif
! extern DL_IMPORT(void) PyErr_BadInternalCall(void);
/* Function to create a new exception */
! DL_IMPORT(PyObject *) PyErr_NewException(char *name, PyObject *base,
! PyObject *dict);
/* In sigcheck.c or signalmodule.c */
! extern DL_IMPORT(int) PyErr_CheckSignals(void);
! extern DL_IMPORT(void) PyErr_SetInterrupt(void);