Skip to content

Commit 207f971

Browse files
HTRamseytony-josi-awsActoryOu
authored
Fix header includes (#1120)
* Fix header includes * Restore include config checks --------- Co-authored-by: Tony Josi <tonyjosi@amazon.com> Co-authored-by: ActoryOu <jay2002824@gmail.com>
1 parent 04a4b54 commit 207f971

37 files changed

+157
-170
lines changed

‎source/include/FreeRTOS_ARP.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#ifndef FREERTOS_ARP_H
2929
#define FREERTOS_ARP_H
3030

31-
/* Application level configuration options. */
32-
#include "FreeRTOSIPConfig.h"
33-
#include "FreeRTOSIPConfigDefaults.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3433

34+
/* Core FreeRTOS+TCP Includes. */
3535
#include "FreeRTOS_IP.h"
3636

3737
/* *INDENT-OFF* */

‎source/include/FreeRTOS_BitConfig.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
#ifndef FREERTOS_BITCONFIG_H
3636
#define FREERTOS_BITCONFIG_H
3737

38+
/* Global Includes & Definitions. */
39+
#include "FreeRTOS_IP_Common.h"
40+
3841
#ifdef __cplusplus
3942
extern "C" {
4043
#endif

‎source/include/FreeRTOS_DHCP.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
#ifndef FREERTOS_DHCP_H
2929
#define FREERTOS_DHCP_H
3030

31-
#include "FreeRTOS.h"
32-
33-
/* Application level configuration options. */
34-
#include "FreeRTOSIPConfig.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3533

34+
/* Core FreeRTOS+TCP Includes. */
3635
#include "FreeRTOS_Sockets.h"
3736

3837
/* *INDENT-OFF* */

‎source/include/FreeRTOS_DHCPv6.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
#ifndef FREERTOS_DHCPV6_H
2727
#define FREERTOS_DHCPV6_H
2828

29-
/* Application level configuration options. */
29+
/* Global Includes & Definitions. */
30+
#include "FreeRTOS_IP_Common.h"
31+
32+
/* Optional FreeRTOS+TCP Includes. */
3033
#include "FreeRTOS_DHCP.h"
31-
#include "FreeRTOSIPConfig.h"
3234

3335
#ifdef __cplusplus
3436
extern "C" {

‎source/include/FreeRTOS_DNS.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@
2828
#ifndef FREERTOS_DNS_H
2929
#define FREERTOS_DNS_H
3030

31-
#include "FreeRTOS.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3233

33-
/* Application level configuration options. */
34-
#include "FreeRTOS_DNS_Globals.h"
35-
#include "FreeRTOS_DNS_Callback.h"
34+
/* Optional FreeRTOS+TCP Includes. */
3635
#include "FreeRTOS_DNS_Cache.h"
36+
#include "FreeRTOS_DNS_Callback.h"
37+
#include "FreeRTOS_DNS_Globals.h"
3738

3839
/* *INDENT-OFF* */
3940
#ifdef __cplusplus

‎source/include/FreeRTOS_DNS_Cache.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@
2828
#ifndef FREERTOS_DNS_CACHE_H
2929
#define FREERTOS_DNS_CACHE_H
3030

31-
/* FreeRTOS includes. */
32-
#include "FreeRTOS.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3333

34+
/* Optional FreeRTOS+TCP Includes. */
3435
#include "FreeRTOS_DNS_Globals.h"
3536

36-
/* Standard includes. */
37-
#include <stdint.h>
38-
3937
#if ( ( ipconfigUSE_DNS_CACHE == 1 ) && ( ipconfigUSE_DNS != 0 ) )
4038

4139
/**

‎source/include/FreeRTOS_DNS_Callback.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,15 @@
2929
#ifndef FREERTOS_DNS_CALLBACK_H
3030
#define FREERTOS_DNS_CALLBACK_H
3131

32-
/* FreeRTOS includes. */
33-
#include "FreeRTOS.h"
32+
/* Global Includes & Definitions. */
33+
#include "FreeRTOS_IP_Common.h"
3434

35-
/* FreeRTOS+TCP includes. */
35+
/* Core FreeRTOS+TCP Includes. */
3636
#include "FreeRTOS_IP.h"
3737

38+
/* Optional FreeRTOS+TCP Includes. */
3839
#include "FreeRTOS_DNS_Globals.h"
3940

40-
/* Standard includes. */
41-
#include <stdint.h>
42-
4341
/* *INDENT-OFF* */
4442
#ifdef __cplusplus
4543
extern "C" {

‎source/include/FreeRTOS_DNS_Globals.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
#ifndef FREERTOS_DNS_GLOBALS_H
2929
#define FREERTOS_DNS_GLOBALS_H
3030

31-
#include "FreeRTOS.h"
32-
33-
#include "FreeRTOSIPConfig.h"
34-
#include "FreeRTOSIPConfigDefaults.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3533

34+
/* Core FreeRTOS+TCP Includes. */
3635
#include "FreeRTOS_Sockets.h"
3736

3837
#define dnsPARSE_ERROR 0UL

‎source/include/FreeRTOS_DNS_Networking.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,14 @@
2727
#ifndef FREERTOS_DNS_NETWORKING_H
2828
#define FREERTOS_DNS_NETWORKING_H
2929

30+
/* Global Includes & Definitions */
31+
#include "FreeRTOS_IP_Common.h"
32+
33+
/* Core FreeRTOS+TCP Includes. */
3034
#include "FreeRTOS_IP.h"
3135
#include "FreeRTOS_Sockets.h"
36+
37+
/* Optional FreeRTOS+TCP Includes. */
3238
#include "FreeRTOS_DNS_Globals.h"
3339

3440
#if ( ipconfigUSE_DNS != 0 )

‎source/include/FreeRTOS_DNS_Parser.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,15 @@
2828
#ifndef FREERTOS_DNS_PARSER_H
2929
#define FREERTOS_DNS_PARSER_H
3030

31-
/* FreeRTOS includes. */
32-
#include "FreeRTOS.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3333

34-
/* FreeRTOS+TCP includes. */
34+
/* Core FreeRTOS+TCP Includes. */
3535
#include "FreeRTOS_IP.h"
3636

37+
/* Optional FreeRTOS+TCP Includes. */
3738
#include "FreeRTOS_DNS_Globals.h"
3839

39-
/* Standard includes. */
40-
#include <stdint.h>
41-
4240
/* *INDENT-OFF* */
4341
#ifdef __cplusplus
4442
extern "C" {

0 commit comments

Comments
 (0)