[pywin32-checkins] pywin32/win32/src PyACL.cpp,1.14,1.15 PyDEVMODE.cpp,1.2,1.3 win32inet.i,1.1,1.2

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

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

Modified Files:
	PyACL.cpp PyDEVMODE.cpp win32inet.i 
Log Message:
Allow things to build on VC6 without a platform SDK installed.


Index: win32inet.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32inet.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** win32inet.i	12 Jun 2004 13:40:34 -0000	1.1
--- win32inet.i	29 Jul 2005 01:33:08 -0000	1.2
***************
*** 422,425 ****
--- 422,426 ----
  );
  
+ %ifdef WINVER >= 0x0500
  // @pyswig <o PyHINTERNET>|FtpCommand|Allows an application to send commands directly to an FTP server.
  BOOLAPI FtpCommand(
***************
*** 435,439 ****
      PyHINTERNET *OUTPUT
  );
! 
  
  %init %{
--- 436,440 ----
      PyHINTERNET *OUTPUT
  );
! %endif
  
  %init %{

Index: PyACL.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyACL.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PyACL.cpp	2 Jun 2005 06:28:47 -0000	1.14
--- PyACL.cpp	29 Jul 2005 01:33:08 -0000	1.15
***************
*** 292,295 ****
--- 292,296 ----
  			break;
  			}		
+ #if WINVER >= 0x0501
  		case TRUSTEE_IS_OBJECTS_AND_SID:
  		case TRUSTEE_IS_OBJECTS_AND_NAME:{
***************
*** 297,300 ****
--- 298,302 ----
  			return FALSE;
  			}
+ #endif
  		default:{
  			PyErr_SetString(PyExc_ValueError, "Invalid value for TrusteeForm");

Index: PyDEVMODE.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyDEVMODE.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyDEVMODE.cpp	10 Sep 2004 03:40:21 -0000	1.2
--- PyDEVMODE.cpp	29 Jul 2005 01:33:08 -0000	1.3
***************
*** 1,3 ****
--- 1,4 ----
  // @doc - This file contains autoduck documentation
+ 
  #include "PyWinTypes.h"
  #include "structmember.h"
***************
*** 43,47 ****
  	{"PelsHeight", 		T_ULONG,   OFF(devmode.dmPelsHeight), 0, "Pixel height of display"},
  	{"DisplayFlags", 	T_ULONG,   OFF(devmode.dmDisplayFlags), 0, "Combination of DM_GRAYSCALE and DM_INTERLACED"},
- 	{"Nup",				T_ULONG,   OFF(devmode.dmNup), 0, "DMNUP_SYSTEM or DMNUP_ONEUP"}, // wtf is a "Nup"?
  	{"DisplayFrequency",T_ULONG,   OFF(devmode.dmDisplayFrequency), 0, "Refresh rate"},
  	{"ICMMethod",		T_ULONG,   OFF(devmode.dmICMMethod), 0, ""},
--- 44,47 ----
***************
*** 51,57 ****
  	{"Reserved1",		T_ULONG,   OFF(devmode.dmReserved1), 0, ""},
  	{"Reserved2",		T_ULONG,   OFF(devmode.dmReserved2), 0, ""},
  	{"PanningWidth",	T_ULONG,   OFF(devmode.dmPanningWidth), 0, ""},
  	{"PanningHeight",	T_ULONG,   OFF(devmode.dmPanningHeight), 0, ""},
! 	{"DriverData",		T_OBJECT,  OFF(obdummy), 0, "Driver data appended to end of structure"},
  	{NULL}
  };
--- 51,60 ----
  	{"Reserved1",		T_ULONG,   OFF(devmode.dmReserved1), 0, ""},
  	{"Reserved2",		T_ULONG,   OFF(devmode.dmReserved2), 0, ""},
+ 	{"DriverData",		T_OBJECT,  OFF(obdummy), 0, "Driver data appended to end of structure"},
+ #if WINVER >= 0x0500
+ 	{"Nup",				T_ULONG,   OFF(devmode.dmNup), 0, "DMNUP_SYSTEM or DMNUP_ONEUP"}, // wtf is a "Nup"?
  	{"PanningWidth",	T_ULONG,   OFF(devmode.dmPanningWidth), 0, ""},
  	{"PanningHeight",	T_ULONG,   OFF(devmode.dmPanningHeight), 0, ""},
! #endif
  	{NULL}
  };