Require bacdef.h as first bacnet header to include (#598) (#600)

* Require bacdeps.h as first bacnet header to include

BACnet headers need to pull in optional configuration and
optional ecosystem overrides to allow integrators to control
builds.  This commit changes bacnet header files to first
include bacnet/bacdep.h to consistently introduce integrator
header files.

Verified by:

1. make clean all test

2. ./zephyr/scripts/twister -p unit_testing \
        -T bacnet-stack/zephyr/tests/



* Migrate BACNET_UNSIGNED_INTEGER defn to bacdef.h

Verified by:

1. make clean all test

2. ./zephyr/scripts/twister -p unit_testing \
        -T bacnet-stack/zephyr/tests/



---------

Signed-off-by: Gregory Shue <gregory.shue@legrand.com>
Co-authored-by: Greg Shue <32416235+gregshue@users.noreply.github.com>
Co-authored-by: Gregory Shue <gregory.shue@legrand.com>

ports/zephyr/bacnet-config.h

@@ -0,0 +1,35 @@
+/**************************************************************************
+*
+* Copyright (c) 2024 Legrand North America, LLC.
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*
+*********************************************************************/
+
+#ifndef BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H
+#define BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H
+
+#if ! defined BACNET_CONFIG_H || ! BACNET_CONFIG_H
+#error bacnet-config.h included outside of BACNET_CONFIG_H control
+#endif
+
+#include <zephyr/sys/util.h>  // Provides platform-specific defn of ARRAY_SIZE()
+
+#endif // BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H

src/bacnet/abort.h

@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
 

src/bacnet/access_rule.h

@@ -28,8 +28,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bacdevobjpropref.h"
 

src/bacnet/alarm_ack.h

@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"

src/bacnet/apdu.h

@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacenum.h"
 
 typedef struct _confirmed_service_data {

src/bacnet/arf.h

@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacstr.h"

src/bacnet/assigned_access_rights.h

@@ -28,8 +28,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bacdevobjpropref.h"
 

src/bacnet/authentication_factor.h

@@ -28,8 +28,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacapp.h"
 
 typedef struct {

src/bacnet/authentication_factor_format.h

@@ -28,8 +28,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 
 typedef struct {
     BACNET_AUTHENTICATION_FACTOR_TYPE format_type;

src/bacnet/awf.h

@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacdcode.h"
 

src/bacnet/bacaddr.h

@@ -27,9 +27,9 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/basic/sys/platform.h"
-#include "bacnet/bacdef.h"
 
 #ifdef __cplusplus
 extern "C" {

src/bacnet/bacapp.h

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacdest.h"
 #include "bacnet/bacint.h"
 #include "bacnet/bacstr.h"

src/bacnet/bacdcode.h

@@ -27,9 +27,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/basic/sys/platform.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/datetime.h"
 #include "bacnet/bacstr.h"
 #include "bacnet/bacint.h"

src/bacnet/bacdef.h

@@ -26,9 +26,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "bacnet/bacenum.h"
-#include "bacnet/bacint.h"
 #include "bacnet/config.h"
+#include "bacnet/bacenum.h"
 
 #if defined(_MSC_VER)
 /* Silence the warnings about unsafe versions of library functions */
@@ -127,6 +126,15 @@
 #error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined!
 #endif
 
+/* Support 64b integers when available */
+#ifdef UINT64_MAX
+typedef uint64_t BACNET_UNSIGNED_INTEGER;
+#define BACNET_UNSIGNED_INTEGER_MAX UINT64_MAX
+#else
+typedef uint32_t BACNET_UNSIGNED_INTEGER;
+#define BACNET_UNSIGNED_INTEGER_MAX UINT32_MAX
+#endif
+
 /* largest BACnet Instance Number */
 /* Also used as a device instance number wildcard address */
 #define BACNET_MAX_INSTANCE (0x3FFFFF)

src/bacnet/bacdest.h

@@ -14,6 +14,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacstr.h"

src/bacnet/bacdevobjpropref.h

@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacint.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/basic/sys/platform.h"

src/bacnet/bacerror.h

@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
 

src/bacnet/bacint.h

@@ -27,16 +27,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 
-#ifdef UINT64_MAX
-typedef uint64_t BACNET_UNSIGNED_INTEGER;
-#define BACNET_UNSIGNED_INTEGER_MAX UINT64_MAX
-#else
-typedef uint32_t BACNET_UNSIGNED_INTEGER;
-#define BACNET_UNSIGNED_INTEGER_MAX UINT32_MAX
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

src/bacnet/bacnet_stack_exports.h

@@ -24,6 +24,7 @@
 #ifndef BACNET_STACK_EXPORTS_H
 #define BACNET_STACK_EXPORTS_H
 
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 
 #ifdef BACNET_STACK_STATIC_DEFINE
     /* We want a static library */

src/bacnet/bacprop.h

@@ -26,6 +26,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
 

src/bacnet/bacpropstates.h

@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"

src/bacnet/bacreal.h

@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 
 #ifdef __cplusplus

src/bacnet/bacstr.h

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/config.h"
 
 /* bit strings

src/bacnet/bactext.h

@@ -31,6 +31,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/indtext.h"
 

src/bacnet/bactimevalue.h

@@ -28,10 +28,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/basic/sys/platform.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
+#include "bacnet/bacint.h"
 #include "bacnet/datetime.h"
 
 /**

src/bacnet/basic/bbmd/h_bbmd.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/datalink/bvlc.h"
 
 #ifdef __cplusplus

src/bacnet/basic/bbmd6/h_bbmd6.h

@@ -32,7 +32,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/datalink/bvlc6.h"
 

src/bacnet/basic/bbmd6/vmac.h

@@ -8,6 +8,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 
 /* define the max MAC as big as IPv6 + port number */

src/bacnet/basic/binding/address.h

@@ -27,8 +27,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacaddr.h"
 #include "bacnet/readrange.h"
 

src/bacnet/basic/client/bac-data.h

@@ -9,7 +9,7 @@
 #define BAC_DATA_H
 
 #include <stdint.h>
-#include "bacnet/bacdef.h"
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/client/bac-discover.h

@@ -10,7 +10,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/client/bac-rw.h

@@ -9,7 +9,7 @@
 #define BAC_RW_H
 
 #include <stdint.h>
-#include "bacnet/bacdef.h"
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/client/bac-task.h

@@ -10,6 +10,7 @@
 #define BACNET_TASK_H
 
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 
 #ifdef __cplusplus

src/bacnet/basic/npdu/h_npdu.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/npdu.h"

src/bacnet/basic/npdu/h_routed_npdu.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/npdu/s_router.h

@@ -32,9 +32,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/object/acc.h

@@ -3,8 +3,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacint.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/access_credential.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/datetime.h"
 #include "bacnet/timestamp.h"

src/bacnet/basic/object/access_door.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/access_point.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/timestamp.h"
 #include "bacnet/bacdevobjpropref.h"

src/bacnet/basic/object/access_rights.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacdevobjpropref.h"
 #include "bacnet/access_rule.h"

src/bacnet/basic/object/access_user.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacdevobjpropref.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/access_zone.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacdevobjpropref.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/ai.h

@@ -28,8 +28,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
 #if defined(INTRINSIC_REPORTING)

src/bacnet/basic/object/ao.h

@@ -36,9 +36,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/config.h"
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/av.h

@@ -28,8 +28,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/wp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/bacfile.h

@@ -36,8 +36,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacint.h"
 #include "bacnet/datetime.h"

src/bacnet/basic/object/bi.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/cov.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/blo.h

@@ -11,8 +11,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/bo.h

@@ -35,9 +35,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/config.h"
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/cov.h"

src/bacnet/basic/object/bv.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/calendar.h

@@ -12,9 +12,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/config.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/calendar_entry.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"

src/bacnet/basic/object/channel.h

@@ -36,8 +36,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
 #include "bacnet/basic/object/lo.h"

src/bacnet/basic/object/color_object.h

@@ -20,9 +20,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/config.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/color_temperature.h

@@ -20,9 +20,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/config.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/command.h

@@ -44,8 +44,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
 

src/bacnet/basic/object/credential_data_input.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/timestamp.h"
 #include "bacnet/bacdevobjpropref.h"

src/bacnet/basic/object/csv.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/device.h

@@ -31,8 +31,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/create_object.h"
 #include "bacnet/delete_object.h"

src/bacnet/basic/object/iv.h

@@ -35,8 +35,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/wp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/lc.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/lsp.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/lsz.h

@@ -22,8 +22,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/ms-input.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/mso.h

@@ -35,9 +35,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/config.h"
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/cov.h"

src/bacnet/basic/object/msv.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/nc.h

@@ -25,6 +25,7 @@
 #ifndef NC_H
 #define NC_H
 
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacdest.h"
 #include "bacnet/event.h"

src/bacnet/basic/object/netport.h

@@ -36,8 +36,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/objects.h

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacstr.h"
 #include "bacnet/bacenum.h"
 

src/bacnet/basic/object/osv.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/wp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/piv.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/wp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/schedule.h

@@ -28,8 +28,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/datetime.h"
 #include "bacnet/bacerror.h"

src/bacnet/basic/object/time_value.h

@@ -12,9 +12,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/config.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/trendlog.h

@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/cov.h"
 #include "bacnet/datetime.h"
 #include "bacnet/readrange.h"

src/bacnet/basic/service/h_alarm_ack.h

@@ -30,8 +30,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/alarm_ack.h"

src/bacnet/basic/service/h_apdu.h

@@ -30,8 +30,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_arf.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_arf_a.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_awf.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_ccov.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/cov.h"

src/bacnet/basic/service/h_cov.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_create_object.h

@@ -12,9 +12,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/apdu.h"
 
 #ifdef __cplusplus

src/bacnet/basic/service/h_dcc.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_delete_object.h

@@ -12,9 +12,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/apdu.h"
 
 #ifdef __cplusplus

src/bacnet/basic/service/h_gas_a.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_get_alarm_sum.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/get_alarm_sum.h"

src/bacnet/basic/service/h_getevent.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/event.h"

src/bacnet/basic/service/h_getevent_a.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_iam.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_ihave.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_list_element.h

@@ -14,9 +14,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
 #include "bacnet/bacenum.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/apdu.h"
 
 #ifdef __cplusplus

src/bacnet/basic/service/h_lso.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_noserv.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_rd.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_rp.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_rp_a.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/rp.h"

src/bacnet/basic/service/h_rpm.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_rpm_a.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 #include "bacnet/rpm.h"

src/bacnet/basic/service/h_rr.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 

src/bacnet/basic/service/h_rr_a.h

@@ -32,8 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
 #include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"