Removed ifdef BACFILE where no longer needed. (#1225)

ports/esp32/src/device.c

@@ -37,9 +37,7 @@
 #if defined(INTRINSIC_REPORTING)
 #include "bacnet/basic/object/nc.h"
 #endif /* defined(INTRINSIC_REPORTING) */
-#if defined(BACFILE)
 #include "bacnet/basic/object/bacfile.h"
-#endif /* defined(BACFILE) */
 #if defined(BAC_UCI)
 #include "bacnet/basic/ucix/ucix.h"
 #endif /* defined(BAC_UCI) */

ports/posix/bacfile-posix.c

@@ -275,14 +275,10 @@ bool bacfile_posix_read_record_data(
  */
 void bacfile_posix_init(void)
 {
-#if defined(BACFILE)
     bacfile_write_stream_data_callback_set(bacfile_posix_write_stream_data);
     bacfile_read_stream_data_callback_set(bacfile_posix_read_stream_data);
     bacfile_write_record_data_callback_set(bacfile_posix_write_record_data);
     bacfile_read_record_data_callback_set(bacfile_posix_read_record_data);
     bacfile_file_size_callback_set(bacfile_posix_file_size);
     bacfile_file_size_set_callback_set(bacfile_posix_file_size_set);
-#elif defined(BACDL_BSC)
-#error BACFILE is not defined for BACnet/SC!
-#endif
 }

ports/stm32f4xx/device.c

@@ -31,9 +31,7 @@
 #include "bacnet/basic/object/mso.h"
 #include "bacnet/basic/object/msv.h"
 #include "bacnet/basic/object/program.h"
-#if defined(BACFILE)
 #include "bacnet/basic/object/bacfile.h"
-#endif
 #if (BACNET_PROTOCOL_REVISION >= 17)
 #include "bacnet/basic/object/netport.h"
 #endif
@@ -97,11 +95,9 @@ static struct my_object_functions {
         Program_Index_To_Instance, Program_Valid_Instance,
         Program_Object_Name, Program_Read_Property,
         Program_Write_Property, Program_Property_Lists},
-#if defined(BACFILE)
     { OBJECT_FILE, bacfile_init, bacfile_count, bacfile_index_to_instance,
         bacfile_valid_instance, bacfile_object_name, bacfile_read_property,
         bacfile_write_property, BACfile_Property_Lists },
-#endif
 #if (BACNET_PROTOCOL_REVISION >= 17)
     { OBJECT_NETWORK_PORT, Network_Port_Init, Network_Port_Count,
         Network_Port_Index_To_Instance, Network_Port_Valid_Instance,

ports/win32/main.c

@@ -38,9 +38,7 @@
 #include "bacnet/basic/object/mso.h"
 #include "bacnet/basic/object/ms-input.h"
 #include "bacnet/basic/object/trendlog.h"
-#if defined(BACFILE)
 #include "bacnet/basic/object/bacfile.h"
-#endif
 
 /** Static receive buffer, initialized with zeros by the C Library Startup Code.
  */
@@ -164,16 +162,14 @@ static void Init_Service_Handlers(void)
     /* handle the data coming back from confirmed requests */
     apdu_set_confirmed_ack_handler(
         SERVICE_CONFIRMED_READ_PROPERTY, handler_read_property_ack);
-#if defined(BACFILE)
-    apdu_set_confirmed_handler(
-        SERVICE_CONFIRMED_ATOMIC_READ_FILE, handler_atomic_read_file);
-#endif
     apdu_set_confirmed_handler(
         SERVICE_CONFIRMED_SUBSCRIBE_COV, handler_cov_subscribe);
 
 #if 0
     /* Adding these handlers require the project(s) to change. */
-#if defined(BACFILE)
+#if defined BACNET_BACKUP_RESTORE
+    apdu_set_confirmed_handler(
+        SERVICE_CONFIRMED_ATOMIC_READ_FILE, handler_atomic_read_file);
     apdu_set_confirmed_handler(SERVICE_CONFIRMED_ATOMIC_WRITE_FILE,
         handler_atomic_write_file);
 #endif