dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
tbrennan3
2010-09-22 02:16:22 +00:00
parent b1c9870989
commit 5e5f38cb06
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/bo.c
+3 -3
View File
@@ -50,7 +50,7 @@ static BACNET_BINARY_PV
Binary_Output_Level[MAX_BINARY_OUTPUTS][BACNET_MAX_PRIORITY]; Binary_Output_Level[MAX_BINARY_OUTPUTS][BACNET_MAX_PRIORITY];
/* Writable out-of-service allows others to play with our Present Value */ /* Writable out-of-service allows others to play with our Present Value */
/* without changing the physical output */ /* 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 */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Binary_Output_Properties_Required[] = { static const int Binary_Output_Properties_Required[] = {
@@ -252,7 +252,7 @@ int Binary_Output_Read_Property(
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = object_index =
Binary_Output_Instance_To_Index(rpdata->object_instance); 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); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
case PROP_POLARITY: case PROP_POLARITY:
@@ -424,7 +424,7 @@ bool Binary_Output_Write_Property(
if (status) { if (status) {
object_index = object_index =
Binary_Output_Instance_To_Index(wp_data->object_instance); 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; value.type.Boolean;
} }
break; break;