From 5e5f38cb06385db64dc837027b27ca2f1cdf05a2 Mon Sep 17 00:00:00 2001 From: tbrennan3 Date: Wed, 22 Sep 2010 02:16:22 +0000 Subject: [PATCH] My gcc complained about a conflict with the function of the same name as the array, Binary_Output_Out_Of_Service. This fix lets it build. --- bacnet-stack/demo/object/bo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bacnet-stack/demo/object/bo.c b/bacnet-stack/demo/object/bo.c index 8378911c..06d09c7c 100644 --- a/bacnet-stack/demo/object/bo.c +++ b/bacnet-stack/demo/object/bo.c @@ -50,7 +50,7 @@ static BACNET_BINARY_PV Binary_Output_Level[MAX_BINARY_OUTPUTS][BACNET_MAX_PRIORITY]; /* Writable out-of-service allows others to play with our Present Value */ /* without changing the physical output */ -static bool Binary_Output_Out_Of_Service[MAX_BINARY_OUTPUTS]; +static bool Binary_Output_Out_Of_Service_Array[MAX_BINARY_OUTPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ static const int Binary_Output_Properties_Required[] = { @@ -252,7 +252,7 @@ int Binary_Output_Read_Property( case PROP_OUT_OF_SERVICE: object_index = Binary_Output_Instance_To_Index(rpdata->object_instance); - state = Binary_Output_Out_Of_Service[object_index]; + state = Binary_Output_Out_Of_Service_Array[object_index]; apdu_len = encode_application_boolean(&apdu[0], state); break; case PROP_POLARITY: @@ -424,7 +424,7 @@ bool Binary_Output_Write_Property( if (status) { object_index = Binary_Output_Instance_To_Index(wp_data->object_instance); - Binary_Output_Out_Of_Service[object_index] = + Binary_Output_Out_Of_Service_Array[object_index] = value.type.Boolean; } break;