pywin32-checkins

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src/win32net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16887/win32net

Modified Files:
      Tag: py3k
	win32netmodule.cpp 
Log Message:
Changes to build for Python 3.0

Index: win32netmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netmodule.cpp,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -C2 -d -r1.26 -r1.26.2.1
*** win32netmodule.cpp	4 Jun 2008 08:18:55 -0000	1.26
--- win32netmodule.cpp	29 Aug 2008 05:00:24 -0000	1.26.2.1
***************
*** 1159,1171 ****
  }
  
! extern "C" __declspec(dllexport) void
! initwin32net(void)
  {
!   PyObject *dict, *module;
!   module = Py_InitModule("win32net", win32net_functions);
!   if (!module) return;
!   dict = PyModule_GetDict(module);
!   if (!dict) return;
    PyWinGlobals_Ensure();
    PyDict_SetItemString(dict, "error", PyWinExc_ApiError);
    PyDict_SetItemString(dict, "SERVICE_SERVER", PyUnicode_FromWideChar(SERVICE_SERVER,wcslen(SERVICE_SERVER)));
--- 1159,1195 ----
  }
  
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initwin32net(void)
! #else
! PyObject *PyInit_win32net(void)
! #endif
  {
!   PyObject *module, *dict;
    PyWinGlobals_Ensure();
+ 
+ #if (PY_VERSION_HEX < 0x03000000)
+ 	module = Py_InitModule("win32net", win32net_functions);
+ 	if (!module)
+ 		return;
+ 	dict = PyModule_GetDict(module);
+ 	if (!dict)
+ 		return;
+ #else
+ 	static PyModuleDef win32net_def = {
+ 		PyModuleDef_HEAD_INIT,
+ 		"win32net",
+ 		"A module encapsulating the Windows Network API.",
+ 		-1,
+ 		win32net_functions
+ 		};
+ 	module = PyModule_Create(&win32net_def);
+ 	if (!module)
+ 		return NULL;
+ 	dict = PyModule_GetDict(module);
+ 	if (!dict)
+ 		return NULL;
+ #endif
+ 
    PyDict_SetItemString(dict, "error", PyWinExc_ApiError);
    PyDict_SetItemString(dict, "SERVICE_SERVER", PyUnicode_FromWideChar(SERVICE_SERVER,wcslen(SERVICE_SERVER)));
***************
*** 1191,1193 ****
--- 1215,1221 ----
    }
  #endif
+ 
+ #if (PY_VERSION_HEX >= 0x03000000)
+ 	return module;
+ #endif
  }