From 3f18b83a9de88142c104e10f7ba847859335c0e6 Mon Sep 17 00:00:00 2001 From: skarg Date: Wed, 4 Jun 2014 03:15:40 +0000 Subject: [PATCH] fixed compiler error about property list function. --- bacnet-stack/ports/bdk-atxx4-mstp/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c index dd72a421..f5a4f60e 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c @@ -208,7 +208,7 @@ bool Device_Write_Property( return status; } -static unsigned property_list_count( +static unsigned my_property_list_count( const int *pList) { unsigned property_count = 0; @@ -248,15 +248,15 @@ void Device_Objects_Property_List( /* Fetch the counts if available otherwise zero them */ pPropertyList->Required.count = pPropertyList->Required.pList == - NULL ? 0 : property_list_count(pPropertyList->Required.pList); + NULL ? 0 : my_property_list_count(pPropertyList->Required.pList); pPropertyList->Optional.count = pPropertyList->Optional.pList == - NULL ? 0 : property_list_count(pPropertyList->Optional.pList); + NULL ? 0 : my_property_list_count(pPropertyList->Optional.pList); pPropertyList->Proprietary.count = pPropertyList->Proprietary.pList == - NULL ? 0 : property_list_count(pPropertyList->Proprietary.pList); + NULL ? 0 : my_property_list_count(pPropertyList->Proprietary.pList); return; }