win-pvdrivers

changeset 836:260fec91f553 0.11.0.250

Fix scsiport build. Work around limitations of DDK conditional expressions in SOURCES
author James Harper <james.harper@bendigoit.com.au>
date Thu Jan 27 19:44:59 2011 +1100 (2011-01-27)
parents e5651aba4e03
children 58e95b6bc6cf
files xenvbd/sources xenvbd/xenvbd.c xenvbd/xenvbd_scsiport.c
line diff
     1.1 --- a/xenvbd/sources	Thu Jan 27 18:20:13 2011 +1100
     1.2 +++ b/xenvbd/sources	Thu Jan 27 19:44:59 2011 +1100
     1.3 @@ -5,9 +5,10 @@ TARGETNAME=xenvbd
     1.4  TARGETTYPE=DRIVER
     1.5  !IF "$(DDK_TARGET_OS)" == "Win2K" || "$(DDK_TARGET_OS)" == "WinXP"
     1.6  TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\scsiport.lib
     1.7 -SOURCES=xenvbd.rc xenvbd_scsiport.c
     1.8 +C_DEFINES=$(C_DEFINES) -D_GPLPV_SCSIPORT
     1.9  !ELSE
    1.10  TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\storport.lib
    1.11 -SOURCES=xenvbd.rc xenvbd_storport.c
    1.12 +C_DEFINES=$(C_DEFINES) -D_GPLPV_STORPORT
    1.13  !ENDIF
    1.14 +SOURCES=xenvbd.rc xenvbd.c
    1.15  NTTARGETFILES=$(NTTARGETFILES) $(OBJ_PATH)\$(O)\$(TARGETNAME).inf
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xenvbd/xenvbd.c	Thu Jan 27 19:44:59 2011 +1100
     2.3 @@ -0,0 +1,5 @@
     2.4 +#ifdef _GPLPV_SCSIPORT
     2.5 +#include "xenvbd_scsiport.c"
     2.6 +#else
     2.7 +#include "xenvbd_storport.c"
     2.8 +#endif
     3.1 --- a/xenvbd/xenvbd_scsiport.c	Thu Jan 27 18:20:13 2011 +1100
     3.2 +++ b/xenvbd/xenvbd_scsiport.c	Thu Jan 27 19:44:59 2011 +1100
     3.3 @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fi
     3.4  */
     3.5  
     3.6  #define INITGUID
     3.7 -#include "xenvbd.h"
     3.8 +#include "xenvbd_scsiport.h"
     3.9  #include <io/blkif.h>
    3.10  #include <scsi.h>
    3.11  #include <ntddscsi.h>