[pywin32-checkins] pywin32/win32/src/PerfMon MappingManager.cpp, 1.4, 1.5 PerfCounterDefn.cpp, 1.1, 1.2 PerfObjectType.cpp, 1.1, 1.2

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

Update of /cvsroot/pywin32/pywin32/win32/src/PerfMon
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1177/win32/src/PerfMon

Modified Files:
	MappingManager.cpp PerfCounterDefn.cpp PerfObjectType.cpp 
Log Message:
Many 'benign' changes from the py3k branch, mainly around using 
PYWIN_OBJECT_HEAD and whitespace related changes around the type defs.


Index: PerfCounterDefn.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PerfMon/PerfCounterDefn.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PerfCounterDefn.cpp	2 Sep 1999 00:24:54 -0000	1.1
--- PerfCounterDefn.cpp	3 Dec 2008 22:34:21 -0000	1.2
***************
*** 108,128 ****
  PyTypeObject PyPERF_COUNTER_DEFINITION::type =
  {
! 	PyObject_HEAD_INIT(&PyType_Type)
! 	0,
  	"PyPERF_COUNTER_DEFINITION",
  	sizeof(PyPERF_COUNTER_DEFINITION),
  	0,
  	PyPERF_COUNTER_DEFINITION::deallocFunc,		/* tp_dealloc */
! 	0,		/* tp_print */
  	PyPERF_COUNTER_DEFINITION::getattr,				/* tp_getattr */
  	PyPERF_COUNTER_DEFINITION::setattr,				/* tp_setattr */
! 	0,	/* tp_compare */
  	0,						/* tp_repr */
  	0,						/* tp_as_number */
! 	0,	/* tp_as_sequence */
  	0,						/* tp_as_mapping */
! 	0,
  	0,						/* tp_call */
! 	0,		/* tp_str */
  };
  
--- 108,127 ----
  PyTypeObject PyPERF_COUNTER_DEFINITION::type =
  {
! 	PYWIN_OBJECT_HEAD
  	"PyPERF_COUNTER_DEFINITION",
  	sizeof(PyPERF_COUNTER_DEFINITION),
  	0,
  	PyPERF_COUNTER_DEFINITION::deallocFunc,		/* tp_dealloc */
! 	0,						/* tp_print */
  	PyPERF_COUNTER_DEFINITION::getattr,				/* tp_getattr */
  	PyPERF_COUNTER_DEFINITION::setattr,				/* tp_setattr */
! 	0,						/* tp_compare */
  	0,						/* tp_repr */
  	0,						/* tp_as_number */
! 	0,						/* tp_as_sequence */
  	0,						/* tp_as_mapping */
! 	0,						/* tp_hash */
  	0,						/* tp_call */
! 	0,						/* tp_str */
  };
  

Index: MappingManager.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PerfMon/MappingManager.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MappingManager.cpp	13 Nov 2008 11:11:58 -0000	1.4
--- MappingManager.cpp	3 Dec 2008 22:34:21 -0000	1.5
***************
*** 186,209 ****
  PyTypeObject PyPerfMonManager::type =
  {
! 	PyObject_HEAD_INIT(&PyType_Type)
! 	0,
  	"PyPerfMonManager",
  	sizeof(PyPerfMonManager),
  	0,
  	PyPerfMonManager::deallocFunc,		/* tp_dealloc */
! 	0,		/* tp_print */
  	PyPerfMonManager::getattr,				/* tp_getattr */
  	PyPerfMonManager::setattr,				/* tp_setattr */
! 	0,	/* tp_compare */
  	0,						/* tp_repr */
  	0,						/* tp_as_number */
! 	0,	/* tp_as_sequence */
  	0,						/* tp_as_mapping */
! 	0,
  	0,						/* tp_call */
! 	0,		/* tp_str */
  };
  
- 
  #define OFF(e) offsetof(PyPerfMonManager, e)
  
--- 186,207 ----
  PyTypeObject PyPerfMonManager::type =
  {
! 	PYWIN_OBJECT_HEAD
  	"PyPerfMonManager",
  	sizeof(PyPerfMonManager),
  	0,
  	PyPerfMonManager::deallocFunc,		/* tp_dealloc */
! 	0,						/* tp_print */
  	PyPerfMonManager::getattr,				/* tp_getattr */
  	PyPerfMonManager::setattr,				/* tp_setattr */
! 	0,						/* tp_compare */
  	0,						/* tp_repr */
  	0,						/* tp_as_number */
! 	0,						/* tp_as_sequence */
  	0,						/* tp_as_mapping */
! 	0,						/* tp_hash */
  	0,						/* tp_call */
! 	0,						/* tp_str */
  };
  
  #define OFF(e) offsetof(PyPerfMonManager, e)
  

Index: PerfObjectType.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PerfMon/PerfObjectType.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PerfObjectType.cpp	2 Sep 1999 00:24:54 -0000	1.1
--- PerfObjectType.cpp	3 Dec 2008 22:34:21 -0000	1.2
***************
*** 65,85 ****
  PyTypeObject PyPERF_OBJECT_TYPE::type =
  {
! 	PyObject_HEAD_INIT(&PyType_Type)
! 	0,
  	"PyPERF_OBJECT_TYPE",
  	sizeof(PyPERF_OBJECT_TYPE),
  	0,
! 	PyPERF_OBJECT_TYPE::deallocFunc,		/* tp_dealloc */
! 	0,		/* tp_print */
  	PyPERF_OBJECT_TYPE::getattr,				/* tp_getattr */
  	PyPERF_OBJECT_TYPE::setattr,				/* tp_setattr */
! 	0,	/* tp_compare */
  	0,						/* tp_repr */
  	0,						/* tp_as_number */
! 	0,	/* tp_as_sequence */
  	0,						/* tp_as_mapping */
! 	0,
  	0,						/* tp_call */
! 	0,		/* tp_str */
  };
  
--- 65,84 ----
  PyTypeObject PyPERF_OBJECT_TYPE::type =
  {
! 	PYWIN_OBJECT_HEAD
  	"PyPERF_OBJECT_TYPE",
  	sizeof(PyPERF_OBJECT_TYPE),
  	0,
! 	PyPERF_OBJECT_TYPE::deallocFunc,	/* tp_dealloc */
! 	0,						/* tp_print */
  	PyPERF_OBJECT_TYPE::getattr,				/* tp_getattr */
  	PyPERF_OBJECT_TYPE::setattr,				/* tp_setattr */
! 	0,						/* tp_compare */
  	0,						/* tp_repr */
  	0,						/* tp_as_number */
! 	0,						/* tp_as_sequence */
  	0,						/* tp_as_mapping */
! 	0,						/* tp_hash */
  	0,						/* tp_call */
! 	0,						/* tp_str */
  };
  
***************
*** 91,95 ****
  	{"ObjectHelpTitleIndex",  T_LONG,  OFF(m_ObjectHelpTitleIndex)}, // @prop integer|ObjectHelpTitleIndex|
  	{"DefaultCounterIndex",        T_LONG,  OFF(m_DefaultCounter)}, // @prop integer|DefaultCounterIndex|
! 	{NULL}	/* Sentinel */
  };
  
--- 90,94 ----
  	{"ObjectHelpTitleIndex",  T_LONG,  OFF(m_ObjectHelpTitleIndex)}, // @prop integer|ObjectHelpTitleIndex|
  	{"DefaultCounterIndex",        T_LONG,  OFF(m_DefaultCounter)}, // @prop integer|DefaultCounterIndex|
! 	{NULL}
  };