Cleaned up Borland compile.

bacnet-stack/demo/handler/h_arf.c

@@ -39,7 +39,9 @@
 #include "device.h"
 #include "ai.h"
 #include "ao.h"
-#include "bacfile.h"
+#if defined(BACFILE)
+    #include "bacfile.h"
+#endif
 
 /*
 from BACnet SSPC-135-2004
@@ -92,6 +94,7 @@ last octet or record of the file, then the 'End Of File' parameter
 shall be TRUE, otherwise FALSE.
 */
 
+#if defined(BACFILE)
 void handler_atomic_read_file(uint8_t * service_request,
     uint16_t service_len,
     BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data)
@@ -195,3 +198,4 @@ ARF_ABORT:
 
     return;
 }
+#endif

bacnet-stack/demo/handler/h_arf_a.c

@@ -46,7 +46,7 @@
 /* Note: it does not have to be the same file=instance */
 /* that someone can read from us.  It is common to */
 /* use the description as the file name. */
-#if BACFILE
+#if defined(BACFILE)
 void handler_atomic_read_file_ack(uint8_t * service_request,
     uint16_t service_len,
     BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data)

bacnet-stack/demo/handler/h_awf.c

@@ -39,7 +39,9 @@
 #include "awf.h"
 /* demo objects */
 #include "device.h"
-#include "bacfile.h"
+#if defined(BACFILE)
+    #include "bacfile.h"
+#endif
 
 /*
 from BACnet SSPC-135-2004
@@ -70,6 +72,7 @@ of the BACnet device is a local matter and is not defined by this
 standard.
 */
 
+#if defined(BACFILE)
 void handler_atomic_write_file(uint8_t * service_request,
     uint16_t service_len,
     BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data)
@@ -160,3 +163,4 @@ AWF_ABORT:
 
     return;
 }
+#endif

bacnet-stack/demo/handler/h_rp.c

@@ -46,8 +46,8 @@
 #include "lc.h"
 #include "lsp.h"
 #include "mso.h"
-#if BACFILE
-#include "bacfile.h"
+#if defined(BACFILE)
+    #include "bacfile.h"
 #endif
 
 static uint8_t Temp_Buf[MAX_APDU] = { 0 };
@@ -170,7 +170,7 @@ int Encode_Property_APDU(
                     error_class, error_code);
             }
             break;
-#if BACFILE
+#if defined(BACFILE)
         case OBJECT_FILE:
             if (bacfile_valid_instance(object_instance)) {
                 apdu_len = bacfile_encode_property_apdu(

bacnet-stack/demo/handler/h_rpm.c

@@ -48,8 +48,8 @@
 #include "lc.h"
 #include "lsp.h"
 #include "mso.h"
-#if BACFILE
-#include "bacfile.h"
+#if defined(BACFILE)
+    #include "bacfile.h"
 #endif
 
 static uint8_t Temp_Buf[MAX_APDU] = { 0 };
@@ -140,7 +140,7 @@ static void RPM_Property_List(
         break;
     case OBJECT_MULTI_STATE_OUTPUT:
         break;
-#if BACFILE
+#if defined(BACFILE)
     case OBJECT_FILE:
         BACfile_Property_Lists(
             &pPropertyList->Required.pList,

bacnet-stack/demo/handler/h_wp.c

@@ -46,8 +46,8 @@
 #include "lc.h"
 #include "lsp.h"
 #include "mso.h"
-#if BACFILE
-#include "bacfile.h"
+#if defined(BACFILE)
+    #include "bacfile.h"
 #endif
 
 void handler_write_property(uint8_t * service_request,
@@ -290,7 +290,7 @@ void handler_write_property(uint8_t * service_request,
 #endif
         }
         break;
-#if BACFILE
+#if defined(BACFILE)
     case OBJECT_FILE:
         if (bacfile_write_property(&wp_data, &error_class,
                 &error_code)) {