[Python-checkins] CVS: python/dist/src/Include cStringIO.h,2.11,2.12 methodobject.h,2.19,2.20 mymalloc.h,2.21,2.22 mymath.h,2.9,2.10 myproto.h,2.8,2.9

Sat, 8 Jul 2000 20:09:58 -0700

Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8264/python/dist/src/Include

Modified Files:
	cStringIO.h methodobject.h mymalloc.h mymath.h myproto.h 
Log Message:
Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.

Index: cStringIO.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/cStringIO.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** cStringIO.h	1999/01/25 21:36:13	2.11
--- cStringIO.h	2000/07/09 03:09:55	2.12
***************
*** 77,96 ****

    /* Read a string.  If the last argument is -1, the remainder will be read. */
!   int(*cread) Py_FPROTO((PyObject *, char **, int));

    /* Read a line */
!   int(*creadline) Py_FPROTO((PyObject *, char **));

    /* Write a string */
!   int(*cwrite) Py_FPROTO((PyObject *, char *, int));

    /* Get the cStringIO object as a Python string */
!   PyObject *(*cgetvalue) Py_FPROTO((PyObject *));

    /* Create a new output object */
!   PyObject *(*NewOutput) Py_FPROTO((int));

    /* Create an input object from a Python string */
!   PyObject *(*NewInput) Py_FPROTO((PyObject *));

    /* The Python types for cStringIO input and output objects.
--- 77,96 ----

    /* Read a string.  If the last argument is -1, the remainder will be read. */
!   int(*cread)(PyObject *, char **, int);

    /* Read a line */
!   int(*creadline)(PyObject *, char **);

    /* Write a string */
!   int(*cwrite)(PyObject *, char *, int);

    /* Get the cStringIO object as a Python string */
!   PyObject *(*cgetvalue)(PyObject *);

    /* Create a new output object */
!   PyObject *(*NewOutput)(int);

    /* Create an input object from a Python string */
!   PyObject *(*NewInput)(PyObject *);

    /* The Python types for cStringIO input and output objects.

Index: methodobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/methodobject.h,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** methodobject.h	2000/07/09 00:20:36	2.19
--- methodobject.h	2000/07/09 03:09:55	2.20
***************
*** 21,27 ****
  #define PyCFunction_Check(op) ((op)->ob_type == &PyCFunction_Type)

! typedef PyObject *(*PyCFunction) Py_FPROTO((PyObject *, PyObject *));
! typedef PyObject *(*PyCFunctionWithKeywords)
! 	Py_FPROTO((PyObject *, PyObject *, PyObject *));

  extern DL_IMPORT(PyCFunction) PyCFunction_GetFunction(PyObject *);
--- 21,27 ----
  #define PyCFunction_Check(op) ((op)->ob_type == &PyCFunction_Type)

! typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
! typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
! 					     PyObject *);

  extern DL_IMPORT(PyCFunction) PyCFunction_GetFunction(PyObject *);

Index: mymalloc.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/mymalloc.h,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** mymalloc.h	2000/06/30 23:58:04	2.21
--- mymalloc.h	2000/07/09 03:09:55	2.22
***************
*** 91,97 ****
  #undef PyCore_REALLOC_PROTO
  #undef PyCore_FREE_PROTO
! #define PyCore_MALLOC_PROTO     Py_PROTO((size_t))
! #define PyCore_REALLOC_PROTO    Py_PROTO((ANY *, size_t))
! #define PyCore_FREE_PROTO       Py_PROTO((ANY *))
  #endif

--- 91,97 ----
  #undef PyCore_REALLOC_PROTO
  #undef PyCore_FREE_PROTO
! #define PyCore_MALLOC_PROTO    (size_t)
! #define PyCore_REALLOC_PROTO   (ANY *, size_t)
! #define PyCore_FREE_PROTO      (ANY *)
  #endif

***************
*** 139,145 ****
     doesn't. Returned pointers must be checked for NULL explicitly.
     No action is performed on failure. */
! extern DL_IMPORT(ANY *) PyMem_Malloc Py_PROTO((size_t));
! extern DL_IMPORT(ANY *) PyMem_Realloc Py_PROTO((ANY *, size_t));
! extern DL_IMPORT(void) PyMem_Free Py_PROTO((ANY *));

  /* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are
--- 139,145 ----
     doesn't. Returned pointers must be checked for NULL explicitly.
     No action is performed on failure. */
! extern DL_IMPORT(ANY *) PyMem_Malloc(size_t);
! extern DL_IMPORT(ANY *) PyMem_Realloc(ANY *, size_t);
! extern DL_IMPORT(void) PyMem_Free(ANY *);

  /* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are
***************
*** 199,203 ****
     #define PyCore_MALLOC_FUNC      d_malloc
     ...
!    #define PyCore_MALLOC_PROTO	Py_PROTO((size_t, char *, unsigned long))
     ...
     #define NEED_TO_DECLARE_MALLOC_AND_FRIEND
--- 199,203 ----
     #define PyCore_MALLOC_FUNC      d_malloc
     ...
!    #define PyCore_MALLOC_PROTO	(size_t, char *, unsigned long)
     ...
     #define NEED_TO_DECLARE_MALLOC_AND_FRIEND

Index: mymath.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/mymath.h,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** mymath.h	2000/05/11 18:19:41	2.9
--- mymath.h	2000/07/09 03:09:55	2.10
***************
*** 11,15 ****

  #ifndef HAVE_HYPOT
! extern double hypot Py_PROTO((double, double));
  #ifdef MWERKS_BEFORE_PRO4
  #define hypot we_dont_want_faulty_hypot_decl
--- 11,15 ----

  #ifndef HAVE_HYPOT
! extern double hypot(double, double);
  #ifdef MWERKS_BEFORE_PRO4
  #define hypot we_dont_want_faulty_hypot_decl

Index: myproto.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/myproto.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** myproto.h	2000/06/30 23:58:04	2.8
--- myproto.h	2000/07/09 03:09:55	2.9
***************
*** 15,18 ****
--- 15,23 ----
  ******************************************************************/

+ /***************************************
+ THIS FILE IS OBSOLETE
+ DON'T USE Py_PROTO or Py_FPROTO anymore.
+ ***************************************/
+ 
  #ifdef HAVE_PROTOTYPES
  #define Py_PROTO(x) x