[pywin32-checkins] pywin32/com/win32comext/shell/src shell.cpp, 1.68.2.5, 1.68.2.6

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

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

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

Index: shell.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/shell.cpp,v
retrieving revision 1.68.2.5
retrieving revision 1.68.2.6
diff -C2 -d -r1.68.2.5 -r1.68.2.6
*** shell.cpp	4 Dec 2008 00:07:22 -0000	1.68.2.5
--- shell.cpp	9 Dec 2008 12:38:52 -0000	1.68.2.6
***************
*** 3326,3363 ****
  
  /* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initshell(void)
! #else
! PyObject *PyInit_shell(void)
! #endif
  {
! 	PyObject *dict, *module;
! 	PyWinGlobals_Ensure();
! 
! #if (PY_VERSION_HEX < 0x03000000)
! #define RETURN_ERROR return;
! 	module = Py_InitModule("shell", shell_methods);
! 	if (!module)
! 		return;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return;
! #else
! #define RETURN_ERROR return NULL;
! 	static PyModuleDef shell_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"shell",
! 		"A module wrapping Windows Shell functions and interfaces",
! 		-1,
! 		shell_methods
! 		};
! 	module = PyModule_Create(&shell_def);
! 	if (!module)
! 		return NULL;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return NULL;
! #endif
  
  	PyDict_SetItemString(dict, "error", PyWinExc_COMError);
--- 3326,3333 ----
  
  /* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(shell)
  {
! 	PYWIN_MODULE_INIT_PREPARE(shell, shell_methods,
! 	                          "A module wrapping Windows Shell functions and interfaces");
  
  	PyDict_SetItemString(dict, "error", PyWinExc_COMError);
***************
*** 3523,3528 ****
  #endif
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
--- 3493,3496 ----
  #endif
  
! 	PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }