[pywin32-checkins] pywin32/com/win32comext/ifilter/src PyIFilter.cpp, 1.6.4.2, 1.6.4.3

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/ifilter/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22375/com/win32comext/ifilter/src

Modified Files:
      Tag: py3k
	PyIFilter.cpp 
Log Message:
Merge more PYWIN32_MODULE_* macro usage from the trunk

Index: PyIFilter.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/ifilter/src/PyIFilter.cpp,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -C2 -d -r1.6.4.2 -r1.6.4.3
*** PyIFilter.cpp	13 Sep 2008 16:21:29 -0000	1.6.4.2
--- PyIFilter.cpp	9 Dec 2008 12:38:52 -0000	1.6.4.3
***************
*** 280,285 ****
  }
  
! #define ADD_CONSTANT(tok) AddConstant(dict, #tok, tok)
! #define ADD_IID(tok) AddIID(dict, #tok, tok)
  
  // @object PyIFilter|Wraps the interfaces used with Indexing Service filtering
--- 280,285 ----
  }
  
! #define ADD_CONSTANT(tok) if (0 != AddConstant(dict, #tok, tok)) PYWIN_MODULE_INIT_RETURN_ERROR
! #define ADD_IID(tok) if (0 != AddIID(dict, #tok, tok)) PYWIN_MODULE_INIT_RETURN_ERROR
  
  // @object PyIFilter|Wraps the interfaces used with Indexing Service filtering
***************
*** 315,351 ****
  
  /* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initifilter(void)
! #else
! PyObject *PyInit_ifilter(void)
! #endif
  {
! 	PyObject *dict, *module;
! 	PyWinGlobals_Ensure();
! 
! #if (PY_VERSION_HEX < 0x03000000)
! 	module = Py_InitModule("ifilter", ifilter_functions);
! 	if (!module)
! 		return;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return;
! #else
! 
! 	static PyModuleDef ifilter_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"ifilter",
! 		"Wraps the interfaces used with Indexing Service filtering",
! 		-1,
! 		ifilter_functions
! 		};
! 	module = PyModule_Create(&ifilter_def);
! 	if (!module)
! 		return NULL;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return NULL;
! #endif
  
  	// Register all of our interfaces, gateways and IIDs.
--- 315,322 ----
  
  /* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(ifilter)
  {
! 	PYWIN_MODULE_INIT_PREPARE(ifilter, ifilter_functions,
! 	                          "Wraps the interfaces used with Indexing Service filtering");
  
  	// Register all of our interfaces, gateways and IIDs.
***************
*** 401,406 ****
  	// NOTE: New constants should go in ifiltercon.py
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
--- 372,375 ----
  	// NOTE: New constants should go in ifiltercon.py
  
! 	PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }