[pywin32-checkins] pywin32/win32/src win32consolemodule.cpp,1.7,1.8 win32crypt.i,1.1,1.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv707/win32/src

Modified Files:
	win32consolemodule.cpp win32crypt.i 
Log Message:
Get things building with the various Python versions we support.


Index: win32consolemodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32consolemodule.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** win32consolemodule.cpp	30 Sep 2005 01:46:42 -0000	1.7
--- win32consolemodule.cpp	23 Oct 2005 11:33:52 -0000	1.8
***************
*** 556,560 ****
--- 556,564 ----
  			return -1;
  			}
+ #if (PY_VERSION_HEX < 0x02030000)
+ 		*dest_ptr=PyLong_AsUnsignedLong(obvalue);
+ #else
  		*dest_ptr=PyInt_AsUnsignedLongMask(obvalue);
+ #endif
  		if ((*dest_ptr==(DWORD)-1) && PyErr_Occurred())
  			return -1;

Index: win32crypt.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32crypt.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** win32crypt.i	4 Jul 2005 05:40:29 -0000	1.1
--- win32crypt.i	23 Oct 2005 11:33:52 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
  #include "PyWinTypes.h"
  #include "malloc.h"
+ #include "abstract.h" // for PyObject_AsReadBuffer
  %}
  
***************
*** 19,26 ****
  BOOL PyWinObject_AsDATA_BLOB(PyObject *ob, DATA_BLOB *b)
  {
-      PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj,
- 					  const void **buffer,
- 					  int *buffer_len);
- 
      return PyObject_AsReadBuffer(ob, (const void **)(&b->pbData), (int *)(&b->cbData))==0;
  }
--- 20,23 ----