[pywin32-checkins] pywin32/com/win32com/src/include PyComTypeObjects.h, 1.5, 1.5.2.1 PythonCOM.h, 1.27, 1.27.2.1

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/src/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9945/include

Modified Files:
      Tag: py3k
	PyComTypeObjects.h PythonCOM.h 
Log Message:
Changes to build for Py3k

Index: PyComTypeObjects.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/include/PyComTypeObjects.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** PyComTypeObjects.h	24 May 2007 06:01:04 -0000	1.5
--- PyComTypeObjects.h	29 Aug 2008 08:27:38 -0000	1.5.2.1
***************
*** 32,45 ****
  
  	static void deallocFunc(PyObject *ob);
- 
  	static PyObject *getitem(PyObject *self, Py_ssize_t index);
  	static Py_ssize_t getlength(PyObject *self);
- 	static PyObject *getattr(PyObject *self, char *name);
- 	static int setattr(PyObject *self, char *name, PyObject *v);
  
! #pragma warning( disable : 4251 )
! 	static struct memberlist memberlist[];
  	static PyTypeObject Type;
- #pragma warning( default : 4251 )
  
  	int memid;
--- 32,41 ----
  
  	static void deallocFunc(PyObject *ob);
  	static PyObject *getitem(PyObject *self, Py_ssize_t index);
  	static Py_ssize_t getlength(PyObject *self);
  
! 	static struct PyMemberDef members[];
! 	static struct PyMethodDef methods[];
  	static PyTypeObject Type;
  
  	int memid;
***************
*** 66,76 ****
  	static PyObject *getitem(PyObject *self, Py_ssize_t index);
  	static Py_ssize_t getlength(PyObject *self);
- 	static PyObject *getattr(PyObject *self, char *name);
- 	static int setattr(PyObject *self, char *name, PyObject *v);
  
! #pragma warning( disable : 4251 )
! 	static struct memberlist memberlist[];
  	static PyTypeObject Type;
- #pragma warning( default : 4251 )
  
  protected:
--- 62,69 ----
  	static PyObject *getitem(PyObject *self, Py_ssize_t index);
  	static Py_ssize_t getlength(PyObject *self);
  
! 	static struct PyMemberDef members[];
! 	static struct PyMethodDef methods[];
  	static PyTypeObject Type;
  
  protected:
***************
*** 105,115 ****
  	static PyObject *getitem(PyObject *self, Py_ssize_t index);
  	static Py_ssize_t getlength(PyObject *self);
! 	static PyObject *getattr(PyObject *self, char *name);
! 	static int setattr(PyObject *self, char *name, PyObject *v);
! 
! #pragma warning( disable : 4251 )
! 	static struct memberlist memberlist[];
  	static PyTypeObject Type;
- #pragma warning( default : 4251 )
  
  	int memid;
--- 98,104 ----
  	static PyObject *getitem(PyObject *self, Py_ssize_t index);
  	static Py_ssize_t getlength(PyObject *self);
! 	static struct PyMemberDef members[];
! 	static struct PyMethodDef methods[];
  	static PyTypeObject Type;
  
  	int memid;
***************
*** 130,139 ****
  	BOOL CopyTo(STGMEDIUM *pDest);
  	static void deallocFunc(PyObject *ob);
! 	static PyObject *getattr(PyObject *self, char *name);
  	STGMEDIUM medium;
! #pragma warning( disable : 4251 )
! 	static struct memberlist memberlist[];
  	static PyTypeObject Type;
- #pragma warning( default : 4251 )
  };
  
--- 119,126 ----
  	BOOL CopyTo(STGMEDIUM *pDest);
  	static void deallocFunc(PyObject *ob);
! 	static PyObject *getattro(PyObject *self, PyObject *obname);
  	STGMEDIUM medium;
! 	static struct PyMethodDef methods[];
  	static PyTypeObject Type;
  };
  

Index: PythonCOM.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/include/PythonCOM.h,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** PythonCOM.h	8 Apr 2008 11:51:26 -0000	1.27
--- PythonCOM.h	29 Aug 2008 08:27:38 -0000	1.27.2.1
***************
*** 158,166 ****
  
  	// is the given object an interface type object? (e.g. PyIUnknown)
! 	static BOOL is_interface_type(const PyObject *ob);
  
  public:
- 	PyMethodChain chain;
- 	PyComTypeObject *baseType;
  	PyIUnknown * (* ctor)(IUnknown *);
  };
--- 158,164 ----
  
  	// is the given object an interface type object? (e.g. PyIUnknown)
! 	static BOOL is_interface_type(PyObject *ob);
  
  public:
  	PyIUnknown * (* ctor)(IUnknown *);
  };
***************
*** 210,214 ****
  	virtual PyObject *iter() {return NULL;}
  	virtual PyObject *iternext() {return NULL;}
- 	static struct PyMethodDef PyIBase::empty_methods[];
  protected:
  	PyIBase();
--- 208,211 ----
***************
*** 216,225 ****
  
  public:
! 	static BOOL is_object( const PyObject *, PyComTypeObject *which);
  	BOOL is_object(PyComTypeObject *which);
  	static void dealloc(PyObject *ob);
  	static PyObject *repr(PyObject *ob);
  	static PyObject *getattro(PyObject *self, PyObject *name);
! 	static int setattr(PyObject *op, char *name, PyObject *v);
  	static int cmp(PyObject *ob1, PyObject *ob2);
  };
--- 213,222 ----
  
  public:
! 	static BOOL is_object(PyObject *, PyComTypeObject *which);
  	BOOL is_object(PyComTypeObject *which);
  	static void dealloc(PyObject *ob);
  	static PyObject *repr(PyObject *ob);
  	static PyObject *getattro(PyObject *self, PyObject *name);
! 	static int setattro(PyObject *op, PyObject *obname, PyObject *v);
  	static int cmp(PyObject *ob1, PyObject *ob2);
  };