move getbufferproc and releasebufferproc to object.h

Author: davidhewitt

Include/buffer.h

@@ -17,7 +17,7 @@ extern "C" {
  *
  */
 
-typedef struct {
+typedef struct Py_buffer {
     void *buf;
     PyObject *obj;        /* owned reference */
     Py_ssize_t len;

Include/cpython/object.h

@@ -2,8 +2,6 @@
 #  error "this header file must not be included directly"
 #endif
 
-#include "buffer.h" // for Py_buffer, included after PyObject has been defined
-
 PyAPI_FUNC(void) _Py_NewReference(PyObject *op);
 
 #ifdef Py_TRACE_REFS
@@ -47,9 +45,6 @@ typedef struct _Py_Identifier {
 #define _Py_static_string(varname, value)  static _Py_Identifier varname = _Py_static_string_init(value)
 #define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname)
 
-typedef int (*getbufferproc)(PyObject *, Py_buffer *, int);
-typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
-
 typedef PyObject *(*vectorcallfunc)(PyObject *callable, PyObject *const *args,
                                     size_t nargsf, PyObject *kwnames);
 

Include/object.h

@@ -220,6 +220,10 @@ typedef int (*initproc)(PyObject *, PyObject *, PyObject *);
 typedef PyObject *(*newfunc)(PyTypeObject *, PyObject *, PyObject *);
 typedef PyObject *(*allocfunc)(PyTypeObject *, Py_ssize_t);
 
+struct Py_buffer;  /* forward definition, defined in buffer.h */
+typedef int (*getbufferproc)(PyObject *, struct Py_buffer *, int);
+typedef void (*releasebufferproc)(PyObject *, struct Py_buffer *);
+
 typedef struct{
     int slot;    /* slot id, see below */
     void *pfunc; /* function pointer */