[pywin32-checkins] pywin32/win32/src/win32net win32netfile.cpp, 1.6, 1.7 win32netgroup.cpp, 1.5, 1.6 win32netmisc.cpp, 1.14, 1.15 win32netmodule.cpp, 1.27, 1.28 win32netsession.cpp, 1.4, 1.5 win32netuse.cpp, 1.5, 1.6 win32netuser.cpp, 1.9, 1.10

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

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

Modified Files:
	win32netfile.cpp win32netgroup.cpp win32netmisc.cpp 
	win32netmodule.cpp win32netsession.cpp win32netuse.cpp 
	win32netuser.cpp 
Log Message:
Avoid lots of warnings including WRITE_RESTRICTED being redefined by
letting pywintypes.h manage the order etc of including python.h, windows.h
and structmember.h.  Also add Py_CLEAR and Py_RETURN_NONE to py2.3 builds.


Index: win32netmisc.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netmisc.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** win32netmisc.cpp	4 Jun 2008 08:18:55 -0000	1.14
--- win32netmisc.cpp	3 Jan 2009 06:43:59 -0000	1.15
***************
*** 4,12 ****
  //
  // @doc
! #include "windows.h"
  #include "lm.h"
  #include "lmuseflg.h"
- #include "Python.h"
- #include "PyWinTypes.h"
  #include "win32net.h"
  #include "stddef.h"
--- 4,10 ----
  //
  // @doc
! #include "PyWinTypes.h"
  #include "lm.h"
  #include "lmuseflg.h"
  #include "win32net.h"
  #include "stddef.h"

Index: win32netmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netmodule.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** win32netmodule.cpp	9 Dec 2008 07:21:06 -0000	1.27
--- win32netmodule.cpp	3 Jan 2009 06:43:59 -0000	1.28
***************
*** 30,38 ****
  #endif
  
! #include "windows.h"
  #include "lm.h"
  #include "lmuseflg.h"
- #include "Python.h"
- #include "PyWinTypes.h"
  #include "win32net.h"
  
--- 30,36 ----
  #endif
  
! #include "PyWinTypes.h"
  #include "lm.h"
  #include "lmuseflg.h"
  #include "win32net.h"
  

Index: win32netuse.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netuse.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32netuse.cpp	18 May 2006 07:44:15 -0000	1.5
--- win32netuse.cpp	3 Jan 2009 06:43:59 -0000	1.6
***************
*** 4,12 ****
  //
  // @doc
! #include "windows.h"
  #include "lm.h"
  #include "lmuseflg.h"
- #include "Python.h"
- #include "PyWinTypes.h"
  #include "win32net.h"
  #include "stddef.h"
--- 4,10 ----
  //
  // @doc
! #include "PyWinTypes.h"
  #include "lm.h"
  #include "lmuseflg.h"
  #include "win32net.h"
  #include "stddef.h"

Index: win32netsession.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netsession.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** win32netsession.cpp	12 Jan 2005 23:38:29 -0000	1.4
--- win32netsession.cpp	3 Jan 2009 06:43:59 -0000	1.5
***************
*** 3,12 ****
  #include "stdio.h"
  #include "assert.h"
! #include "windows.h" 
  #include "lm.h"
- #include "windows.h"
- #include "Python.h"
  #include "WinUser.h"
- #include "PyWinTypes.h"
  #include "win32net.h"
  
--- 3,9 ----
  #include "stdio.h"
  #include "assert.h"
! #include "PyWinTypes.h"
  #include "lm.h"
  #include "WinUser.h"
  #include "win32net.h"
  

Index: win32netuser.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netuser.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32netuser.cpp	4 Aug 2006 08:32:48 -0000	1.9
--- win32netuser.cpp	3 Jan 2009 06:43:59 -0000	1.10
***************
*** 8,15 ****
  ***********************************************************/
  // @doc
- #include "windows.h"
- #include "lm.h"
- #include "Python.h"
  #include "PyWinTypes.h"
  #include "win32net.h"
  #include "stddef.h"
--- 8,13 ----
  ***********************************************************/
  // @doc
  #include "PyWinTypes.h"
+ #include "lm.h"
  #include "win32net.h"
  #include "stddef.h"

Index: win32netgroup.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netgroup.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32netgroup.cpp	6 Mar 2004 23:55:59 -0000	1.5
--- win32netgroup.cpp	3 Jan 2009 06:43:59 -0000	1.6
***************
*** 4,11 ****
  //
  // @doc
- #include "windows.h"
- #include "lm.h"
- #include "Python.h"
  #include "PyWinTypes.h"
  #include "win32net.h"
  #include "stddef.h"
--- 4,9 ----
  //
  // @doc
  #include "PyWinTypes.h"
+ #include "lm.h"
  #include "win32net.h"
  #include "stddef.h"

Index: win32netfile.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netfile.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32netfile.cpp	24 May 2007 06:01:06 -0000	1.6
--- win32netfile.cpp	3 Jan 2009 06:43:59 -0000	1.7
***************
*** 1,12 ****
  // @doc
  // Implemented and contributed by Roger Upole.
  #include "stdio.h"
  #include "assert.h"
- #include "windows.h" 
  #include "lm.h"
- #include "windows.h"
- #include "Python.h"
  #include "WinUser.h"
- #include "PyWinTypes.h"
  #include "win32net.h"
  
--- 1,9 ----
  // @doc
  // Implemented and contributed by Roger Upole.
+ #include "PyWinTypes.h"
  #include "stdio.h"
  #include "assert.h"
  #include "lm.h"
  #include "WinUser.h"
  #include "win32net.h"