[pywin32-checkins] pywin32/com/win32comext/internet/src internet.cpp, 1.4.2.3, 1.4.2.4

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

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

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

Index: internet.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/internet/src/internet.cpp,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -d -r1.4.2.3 -r1.4.2.4
*** internet.cpp	2 Nov 2008 13:00:38 -0000	1.4.2.3
--- internet.cpp	9 Dec 2008 12:38:52 -0000	1.4.2.4
***************
*** 257,292 ****
  
  /* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initinternet(void)
! #else
! PyObject *PyInit_internet(void)
! #endif
  {
! 	PyObject *dict, *module;
! 	PyWinGlobals_Ensure();
! 
! #if (PY_VERSION_HEX < 0x03000000)
! 	module = Py_InitModule("internet", internet_functions);
! 	if (!module)
! 		return;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return;
! #else
! 	static PyModuleDef internet_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"internet",
! 		"A module, encapsulating the ActiveX Internet interfaces",
! 		-1,
! 		internet_functions
! 		};
! 	module = PyModule_Create(&internet_def);
! 	if (!module)
! 		return NULL;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		return NULL;
! #endif
  
  	// Register all of our interfaces, gateways and IIDs.
--- 257,264 ----
  
  /* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(internet)
  {
! 	PYWIN_MODULE_INIT_PREPARE(internet, internet_functions,
! 	                          "A module, encapsulating the ActiveX Internet interfaces");
  
  	// Register all of our interfaces, gateways and IIDs.
***************
*** 340,345 ****
  //	ADD_CONSTANT(); // @const internet||
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
--- 312,315 ----
  //	ADD_CONSTANT(); // @const internet||
  
! 	PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }