Merge branch 'feature/modbus_fix_parameter_include_order' into 'master'

modbus: fix common parameters include order Closes IDFGH-9427 See merge request espressif/esp-idf!22436
espressif · Feb 22, 2023 · 229635d · 229635d
2 parents b6588eb + 953edad
commit 229635d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/examples/protocols/modbus/mb_example_common/include/modbus_params.h b/examples/protocols/modbus/mb_example_common/include/modbus_params.h
@@ -13,6 +13,8 @@
 #ifndef _DEVICE_PARAMS
 #define _DEVICE_PARAMS
 
+#include <stdint.h>
+
 // This file defines structure of modbus parameters which reflect correspond modbus address space
 // for each modbus register type (coils, discreet inputs, holding registers, input registers)
 #pragma pack(push, 1)

diff --git a/examples/protocols/modbus/mb_example_common/modbus_params.c b/examples/protocols/modbus/mb_example_common/modbus_params.c
@@ -7,7 +7,6 @@
  * Description:
  *   C file to define parameter storage instances
  *====================================================================================*/
-#include <stdint.h>
 #include "modbus_params.h"
 
 // Here are the user defined instances for device parameters packed by 1 byte