diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h
index ba540b0b4a..f9724bdfa5 100644
--- a/source/include/FreeRTOSIPConfigDefaults.h
+++ b/source/include/FreeRTOSIPConfigDefaults.h
@@ -36,6 +36,7 @@
 #ifndef FREERTOS_IP_CONFIG_DEFAULTS_H
 #define FREERTOS_IP_CONFIG_DEFAULTS_H
 
+#include <cstdint>
 #ifndef FREERTOS_CONFIG_H
     #error FreeRTOSConfig.h has not been included yet
 #endif
@@ -491,7 +492,7 @@ STATIC_ASSERT( ipconfigRA_IP_TEST_TIME_OUT_MSEC <= ( portMAX_DELAY * portTICK_PE
     #define ipconfigMAX_IP_TASK_SLEEP_TIME    pdMS_TO_TICKS( 10000 )
 #endif
 
-STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME >= 0L );
+STATIC_ASSERT( ( int64_t ) ipconfigMAX_IP_TASK_SLEEP_TIME >= 0 );
 
 STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME <= portMAX_DELAY );
 
@@ -1765,7 +1766,7 @@ STATIC_ASSERT( ipconfigTCP_KEEP_ALIVE_INTERVAL <= ( portMAX_DELAY / configTICK_R
     #define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS    pdMS_TO_TICKS( 20 )
 #endif
 
-STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0L );
+STATIC_ASSERT( ( int64_t ) ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0 );
 
 STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY );
 
@@ -1956,7 +1957,7 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY );
     #define ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME    portMAX_DELAY
 #endif
 
-STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0L );
+STATIC_ASSERT( ( int64_t ) ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0 );
 
 STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY );
 
@@ -1986,7 +1987,7 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY );
     #define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME    portMAX_DELAY
 #endif
 
-STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0L );
+STATIC_ASSERT( ( int64_t ) ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0 );
 
 STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY );
 
@@ -2377,7 +2378,7 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY );
     #endif
 #endif
 
-STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0L );
+STATIC_ASSERT( ( int64_t ) ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0 );
 
 STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY );
 
@@ -2577,7 +2578,7 @@ STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY );
     #define ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS    pdMS_TO_TICKS( 5000 )
 #endif
 
-STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0L );
+STATIC_ASSERT( ( int64_t ) ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0 );
 
 STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY );
 
@@ -2602,7 +2603,7 @@ STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY );
     #define ipconfigDNS_SEND_BLOCK_TIME_TICKS    pdMS_TO_TICKS( 500 )
 #endif
 
-STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0L );
+STATIC_ASSERT( ( int64_t ) ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0 );
 
 STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY );