win-pvdrivers

changeset 392:acff0605d6d6

fix xennet compile error using ms compiler
author Andy Grover <andy.grover@oracle.com>
date Tue Jul 15 20:31:24 2008 -0700 (2008-07-15)
parents 8e10579159a0
children b8380915c051
files common/include/xen_windows.h xennet/xennet_oid.c
line diff
     1.1 --- a/common/include/xen_windows.h	Tue Jul 15 18:27:06 2008 -0700
     1.2 +++ b/common/include/xen_windows.h	Tue Jul 15 20:31:24 2008 -0700
     1.3 @@ -66,12 +66,11 @@ typedef unsigned long xenbus_transaction
     1.4  #define FUNCTION_ERROR_EXIT() KdPrint((__DRIVER_NAME " <-- %s (error path)\n", __FUNCTION__))
     1.5  #define FUNCTION_CALLED()     KdPrint((__DRIVER_NAME " %s called\n", __FUNCTION__))
     1.6  #ifdef __MINGW32__
     1.7 -#define FUNCTION_MSG(format, args...) KdPrint((__DRIVER_NAME " %s called:" format, \
     1.8 -  __FUNCTION__, ##args))
     1.9 +#define FUNCTION_MSG(format, args...) KdPrint((__DRIVER_NAME " %s called: " format, __FUNCTION__, ##args))
    1.10  #else
    1.11 -#define FUNCTION_MSG(_x_)     { \
    1.12 +#define FUNCTION_MSG(_x)     {  \
    1.13      KdPrint((__DRIVER_NAME " %s called: ", __FUNCTION__));          \
    1.14 -    KdPrint((_x_))              \
    1.15 +    KdPrint(_x);                \
    1.16    }
    1.17  #endif
    1.18  
     2.1 --- a/xennet/xennet_oid.c	Tue Jul 15 18:27:06 2008 -0700
     2.2 +++ b/xennet/xennet_oid.c	Tue Jul 15 20:31:24 2008 -0700
     2.3 @@ -104,12 +104,12 @@ XenNet_QueryInformation(
     2.4        if (!xi->connected)
     2.5        {
     2.6          temp_data = NdisHardwareStatusInitializing;
     2.7 -        FUNCTION_MSG("NdisHardwareStatusInitializing\n");
     2.8 +        FUNCTION_MSG(("NdisHardwareStatusInitializing\n"));
     2.9        }
    2.10        else
    2.11        {
    2.12          temp_data = NdisHardwareStatusReady;
    2.13 -        FUNCTION_MSG("NdisHardwareStatusReady\n");
    2.14 +        FUNCTION_MSG(("NdisHardwareStatusReady\n"));
    2.15        }
    2.16        break;
    2.17      case OID_GEN_MEDIA_SUPPORTED:
    2.18 @@ -361,7 +361,7 @@ XenNet_QueryInformation(
    2.19    if (len > InformationBufferLength)
    2.20    {
    2.21      *BytesNeeded = len;
    2.22 -    FUNCTION_MSG("(BUFFER_TOO_SHORT %d > %d)\n", len, InformationBufferLength);
    2.23 +    FUNCTION_MSG(("(BUFFER_TOO_SHORT %d > %d)\n", len, InformationBufferLength));
    2.24      return NDIS_STATUS_BUFFER_TOO_SHORT;
    2.25    }
    2.26