[pywin32-checkins] pywin32/win32/src/win32print win32print.cpp, 1.30.2.2, 1.30.2.3

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

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

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

Index: win32print.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32print/win32print.cpp,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -C2 -d -r1.30.2.2 -r1.30.2.3
*** win32print.cpp	11 Oct 2008 18:35:00 -0000	1.30.2.2
--- win32print.cpp	9 Dec 2008 12:38:52 -0000	1.30.2.3
***************
*** 2639,2674 ****
  
  
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initwin32print(void)
! #else
! PyObject *PyInit_win32print(void)
! #endif
  {
!   PyObject *module, *dict;
!   PyWinGlobals_Ensure();
! 
! #if (PY_VERSION_HEX < 0x03000000)
! 	module = Py_InitModule("win32print", win32print_functions);
! 	if (!module)
! 		return;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return;
! #else
! 	static PyModuleDef win32print_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"win32print",
! 		"A module encapsulating the Windows printing API.",
! 		-1,
! 		win32print_functions
! 		};
! 	module = PyModule_Create(&win32print_def);
! 	if (!module)
! 		return NULL;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return NULL;
! #endif
  
    AddConstant(dict, "PRINTER_INFO_1", 1);
--- 2639,2646 ----
  
  
! PYWIN_MODULE_INIT_FUNC(win32print)
  {
!   PYWIN_MODULE_INIT_PREPARE(win32print, win32print_functions,
!                             "A module encapsulating the Windows printing API.")
  
    AddConstant(dict, "PRINTER_INFO_1", 1);
***************
*** 2854,2859 ****
    dummy_tuple=PyTuple_New(0);
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
--- 2826,2829 ----
    dummy_tuple=PyTuple_New(0);
  
!   PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }