From 1282712ea5a6d20067e4ff2d9e1eaf25c47b4ed5 Mon Sep 17 00:00:00 2001 From: Karsten Sperling <113487422+ksperling-apple@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:20:57 +1300 Subject: [PATCH] Don't define __STDC_{FORMAT,LIMIT}_MACROS (#32542) * Don't define __STDC_{FORMAT,LIMIT}_MACROS The need for this workaround was removed in glibc years ago. See https://sourceware.org/bugzilla/show_bug.cgi?id=15366 * restyle --- src/ble/BLEEndPoint.cpp | 3 --- src/ble/BleLayer.h | 3 --- src/ble/BtpEngine.h | 4 ---- src/ble/tests/TestBleErrorStr.cpp | 8 -------- src/controller/CHIPDeviceController.cpp | 7 ------- src/credentials/CHIPCert.cpp | 4 ---- src/credentials/CHIPCertFromX509.cpp | 4 ---- src/credentials/CHIPCertToX509.cpp | 4 ---- src/credentials/GenerateChipX509Cert.cpp | 4 ---- src/inet/IPAddress-StringFuncts.cpp | 3 --- src/inet/IPAddress.cpp | 4 ---- src/inet/InetInterface.cpp | 4 ---- src/inet/tests/TestInetCommon.h | 4 ---- src/inet/tests/TestInetCommonOptions.cpp | 7 ------- src/inet/tests/TestInetCommonPosix.cpp | 7 ------- src/inet/tests/TestInetEndPoint.cpp | 4 ---- src/inet/tests/TestInetErrorStr.cpp | 8 -------- src/inet/tests/TestInetLayer.cpp | 4 ---- src/lib/asn1/ASN1Writer.cpp | 3 --- src/lib/core/ErrorStr.cpp | 4 ---- src/lib/core/TLVCircularBuffer.cpp | 4 ---- src/lib/core/TLVDebug.cpp | 4 ---- src/lib/core/TLVWriter.cpp | 4 ---- src/lib/core/tests/TestCHIPErrorStr.cpp | 8 -------- src/lib/support/Base64.cpp | 3 --- src/lib/support/CHIPArgParser.cpp | 7 ------- src/lib/support/TimeUtils.cpp | 3 --- src/lib/support/tests/TestPersistedCounter.cpp | 4 ---- src/lwip/standalone/arch/cc.h | 4 ---- src/messaging/ExchangeContext.cpp | 7 ------- src/messaging/ExchangeMessageDispatch.cpp | 8 -------- src/messaging/ExchangeMgr.cpp | 8 -------- src/system/SystemPacketBuffer.cpp | 4 ---- src/system/SystemStats.h | 5 ----- src/system/tests/TestSystemClock.cpp | 4 ---- src/system/tests/TestSystemErrorStr.cpp | 8 -------- src/system/tests/TestSystemPacketBuffer.cpp | 4 ---- src/system/tests/TestSystemTimer.cpp | 4 ---- src/system/tests/TestSystemWakeEvent.cpp | 4 ---- src/system/tests/TestTimeSource.cpp | 4 ---- src/tools/chip-cert/CertUtils.cpp | 2 -- src/tools/chip-cert/Cmd_GenAttCert.cpp | 4 ---- src/tools/chip-cert/Cmd_GenCD.cpp | 4 ---- src/tools/chip-cert/Cmd_GenCert.cpp | 4 ---- src/tools/chip-cert/Cmd_ResignCert.cpp | 4 ---- src/tools/spake2p/Cmd_GenVerifier.cpp | 4 ---- src/transport/raw/tests/TestPeerAddress.cpp | 8 -------- 47 files changed, 224 deletions(-) diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp index 63708af678efbd..5f60c009753cbe 100644 --- a/src/ble/BLEEndPoint.cpp +++ b/src/ble/BLEEndPoint.cpp @@ -25,9 +25,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif #include #include diff --git a/src/ble/BleLayer.h b/src/ble/BleLayer.h index f175334173ba7f..af2267b770fcf8 100644 --- a/src/ble/BleLayer.h +++ b/src/ble/BleLayer.h @@ -47,9 +47,6 @@ #pragma once -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif #include #include diff --git a/src/ble/BtpEngine.h b/src/ble/BtpEngine.h index 7ec59e35a60c62..2055c2a9c1cfbb 100644 --- a/src/ble/BtpEngine.h +++ b/src/ble/BtpEngine.h @@ -27,10 +27,6 @@ #pragma once -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/ble/tests/TestBleErrorStr.cpp b/src/ble/tests/TestBleErrorStr.cpp index 4e940e7ca58e62..e2b13f4f4c63a3 100644 --- a/src/ble/tests/TestBleErrorStr.cpp +++ b/src/ble/tests/TestBleErrorStr.cpp @@ -24,14 +24,6 @@ * */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 942a488d38c2cd..637e5debffae72 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -25,13 +25,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - // module header, comes first #include diff --git a/src/credentials/CHIPCert.cpp b/src/credentials/CHIPCert.cpp index 2af62ab2efe0f0..5bad0ab75076a9 100644 --- a/src/credentials/CHIPCert.cpp +++ b/src/credentials/CHIPCert.cpp @@ -25,10 +25,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/credentials/CHIPCertFromX509.cpp b/src/credentials/CHIPCertFromX509.cpp index d07b2a515b8644..d5c08b27de8bb0 100644 --- a/src/credentials/CHIPCertFromX509.cpp +++ b/src/credentials/CHIPCertFromX509.cpp @@ -24,10 +24,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/credentials/CHIPCertToX509.cpp b/src/credentials/CHIPCertToX509.cpp index 3793062231ce7f..9e0549d13f4921 100644 --- a/src/credentials/CHIPCertToX509.cpp +++ b/src/credentials/CHIPCertToX509.cpp @@ -24,10 +24,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/credentials/GenerateChipX509Cert.cpp b/src/credentials/GenerateChipX509Cert.cpp index 0dccaaa3a49fa6..2ce37b93d834aa 100644 --- a/src/credentials/GenerateChipX509Cert.cpp +++ b/src/credentials/GenerateChipX509Cert.cpp @@ -22,10 +22,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/inet/IPAddress-StringFuncts.cpp b/src/inet/IPAddress-StringFuncts.cpp index 12beec23ec2295..13bbb4e0f81b90 100644 --- a/src/inet/IPAddress-StringFuncts.cpp +++ b/src/inet/IPAddress-StringFuncts.cpp @@ -23,9 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif #include #include #include diff --git a/src/inet/IPAddress.cpp b/src/inet/IPAddress.cpp index 0fc8cd9d2284a9..c6059fb1f56bdb 100644 --- a/src/inet/IPAddress.cpp +++ b/src/inet/IPAddress.cpp @@ -27,10 +27,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/inet/InetInterface.cpp b/src/inet/InetInterface.cpp index a893f80f4d605b..db10bdba3ed769 100644 --- a/src/inet/InetInterface.cpp +++ b/src/inet/InetInterface.cpp @@ -23,10 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/inet/tests/TestInetCommon.h b/src/inet/tests/TestInetCommon.h index 3665f3938967d8..dcc506856228d6 100644 --- a/src/inet/tests/TestInetCommon.h +++ b/src/inet/tests/TestInetCommon.h @@ -30,10 +30,6 @@ #pragma once -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/inet/tests/TestInetCommonOptions.cpp b/src/inet/tests/TestInetCommonOptions.cpp index 727b6a107b28f1..fc9c8df320a5c6 100644 --- a/src/inet/tests/TestInetCommonOptions.cpp +++ b/src/inet/tests/TestInetCommonOptions.cpp @@ -23,13 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "TestInetCommonOptions.h" #include diff --git a/src/inet/tests/TestInetCommonPosix.cpp b/src/inet/tests/TestInetCommonPosix.cpp index 78126cbf5ff748..71437913819c24 100644 --- a/src/inet/tests/TestInetCommonPosix.cpp +++ b/src/inet/tests/TestInetCommonPosix.cpp @@ -27,13 +27,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "TestInetCommon.h" #include "TestInetCommonOptions.h" diff --git a/src/inet/tests/TestInetEndPoint.cpp b/src/inet/tests/TestInetEndPoint.cpp index 4f5eba1a84bd36..f1684380446ef4 100644 --- a/src/inet/tests/TestInetEndPoint.cpp +++ b/src/inet/tests/TestInetEndPoint.cpp @@ -24,10 +24,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/inet/tests/TestInetErrorStr.cpp b/src/inet/tests/TestInetErrorStr.cpp index 42120331ab9936..5689267b9c86b0 100644 --- a/src/inet/tests/TestInetErrorStr.cpp +++ b/src/inet/tests/TestInetErrorStr.cpp @@ -24,14 +24,6 @@ * */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/inet/tests/TestInetLayer.cpp b/src/inet/tests/TestInetLayer.cpp index 47e83316228b5f..a43b3c7a08affc 100644 --- a/src/inet/tests/TestInetLayer.cpp +++ b/src/inet/tests/TestInetLayer.cpp @@ -25,10 +25,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/lib/asn1/ASN1Writer.cpp b/src/lib/asn1/ASN1Writer.cpp index 7d5a81f4cf1205..f916d138ae3c4d 100644 --- a/src/lib/asn1/ASN1Writer.cpp +++ b/src/lib/asn1/ASN1Writer.cpp @@ -24,9 +24,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif #include #include #include diff --git a/src/lib/core/ErrorStr.cpp b/src/lib/core/ErrorStr.cpp index 5551ff60d413cd..a32ff6bc433344 100644 --- a/src/lib/core/ErrorStr.cpp +++ b/src/lib/core/ErrorStr.cpp @@ -17,10 +17,6 @@ */ #include -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include #include #include diff --git a/src/lib/core/TLVCircularBuffer.cpp b/src/lib/core/TLVCircularBuffer.cpp index 76a392f90f1644..264d41a10ff175 100644 --- a/src/lib/core/TLVCircularBuffer.cpp +++ b/src/lib/core/TLVCircularBuffer.cpp @@ -28,10 +28,6 @@ */ #include -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/lib/core/TLVDebug.cpp b/src/lib/core/TLVDebug.cpp index 4d922f6285ebd1..12c3a7933825c9 100644 --- a/src/lib/core/TLVDebug.cpp +++ b/src/lib/core/TLVDebug.cpp @@ -17,10 +17,6 @@ */ #include -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include #include diff --git a/src/lib/core/TLVWriter.cpp b/src/lib/core/TLVWriter.cpp index 2e946d0403267a..db019fb5488622 100644 --- a/src/lib/core/TLVWriter.cpp +++ b/src/lib/core/TLVWriter.cpp @@ -17,10 +17,6 @@ */ #include -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp index 06ba1c8040f8d1..8f21a2e9ec3397 100644 --- a/src/lib/core/tests/TestCHIPErrorStr.cpp +++ b/src/lib/core/tests/TestCHIPErrorStr.cpp @@ -24,14 +24,6 @@ * */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/lib/support/Base64.cpp b/src/lib/support/Base64.cpp index 8c6bfe2e7c237d..fc3427b8361780 100644 --- a/src/lib/support/Base64.cpp +++ b/src/lib/support/Base64.cpp @@ -22,9 +22,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif #include "Base64.h" #include diff --git a/src/lib/support/CHIPArgParser.cpp b/src/lib/support/CHIPArgParser.cpp index ed123452442748..b791f16a560196 100644 --- a/src/lib/support/CHIPArgParser.cpp +++ b/src/lib/support/CHIPArgParser.cpp @@ -23,13 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include "CHIPArgParser.hpp" #if CHIP_CONFIG_ENABLE_ARG_PARSER diff --git a/src/lib/support/TimeUtils.cpp b/src/lib/support/TimeUtils.cpp index ff0a6f8221d98a..af70656c42d52f 100644 --- a/src/lib/support/TimeUtils.cpp +++ b/src/lib/support/TimeUtils.cpp @@ -23,9 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif #include #include #include diff --git a/src/lib/support/tests/TestPersistedCounter.cpp b/src/lib/support/tests/TestPersistedCounter.cpp index 558a425a48df74..e4cf11de9fbc9b 100644 --- a/src/lib/support/tests/TestPersistedCounter.cpp +++ b/src/lib/support/tests/TestPersistedCounter.cpp @@ -23,10 +23,6 @@ * */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - #include #include diff --git a/src/lwip/standalone/arch/cc.h b/src/lwip/standalone/arch/cc.h index adeadea3bbacc4..74110797475de8 100644 --- a/src/lwip/standalone/arch/cc.h +++ b/src/lwip/standalone/arch/cc.h @@ -52,10 +52,6 @@ #ifndef __ARCH_CC_H__ #define __ARCH_CC_H__ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - /* Include some files for defining library routines */ #include #include diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp index 15522ebcb76d77..74a861c1170b7f 100644 --- a/src/messaging/ExchangeContext.cpp +++ b/src/messaging/ExchangeContext.cpp @@ -20,13 +20,6 @@ * This file implements the ExchangeContext class. * */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif #include #include diff --git a/src/messaging/ExchangeMessageDispatch.cpp b/src/messaging/ExchangeMessageDispatch.cpp index 950be48ae5802a..a94f1310549eb4 100644 --- a/src/messaging/ExchangeMessageDispatch.cpp +++ b/src/messaging/ExchangeMessageDispatch.cpp @@ -20,14 +20,6 @@ * This file provides implementation of ExchangeMessageDispatch class. */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp index 2ca22031094bb7..3971864bb7e06e 100644 --- a/src/messaging/ExchangeMgr.cpp +++ b/src/messaging/ExchangeMgr.cpp @@ -21,14 +21,6 @@ * */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/system/SystemPacketBuffer.cpp b/src/system/SystemPacketBuffer.cpp index 32f4b8e3830077..0226ab783f2415 100644 --- a/src/system/SystemPacketBuffer.cpp +++ b/src/system/SystemPacketBuffer.cpp @@ -23,10 +23,6 @@ * mechanisms for manipulating packets of octet-serialized * data. */ -// Include standard C library limit macros -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif // Include module header #include diff --git a/src/system/SystemStats.h b/src/system/SystemStats.h index 1bda5f2c5b1623..24c1dad9ae36c5 100644 --- a/src/system/SystemStats.h +++ b/src/system/SystemStats.h @@ -24,11 +24,6 @@ #pragma once -// Include standard C library limit macros -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - // Include configuration headers #include #include diff --git a/src/system/tests/TestSystemClock.cpp b/src/system/tests/TestSystemClock.cpp index f0a5315fe9975a..63fcfaa3566e5d 100644 --- a/src/system/tests/TestSystemClock.cpp +++ b/src/system/tests/TestSystemClock.cpp @@ -15,10 +15,6 @@ * limitations under the License. */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/system/tests/TestSystemErrorStr.cpp b/src/system/tests/TestSystemErrorStr.cpp index cb67d1b30d5c1e..0296eb957c5dea 100644 --- a/src/system/tests/TestSystemErrorStr.cpp +++ b/src/system/tests/TestSystemErrorStr.cpp @@ -24,14 +24,6 @@ * */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/system/tests/TestSystemPacketBuffer.cpp b/src/system/tests/TestSystemPacketBuffer.cpp index 9bf2597d7a92b5..527d3a19a32e4b 100644 --- a/src/system/tests/TestSystemPacketBuffer.cpp +++ b/src/system/tests/TestSystemPacketBuffer.cpp @@ -23,10 +23,6 @@ * structure for network packet buffer management. */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include diff --git a/src/system/tests/TestSystemTimer.cpp b/src/system/tests/TestSystemTimer.cpp index cbfd22ac87476e..5cd499fdcb816f 100644 --- a/src/system/tests/TestSystemTimer.cpp +++ b/src/system/tests/TestSystemTimer.cpp @@ -23,10 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/system/tests/TestSystemWakeEvent.cpp b/src/system/tests/TestSystemWakeEvent.cpp index 20bd65821aa4ae..46ed99dae31656 100644 --- a/src/system/tests/TestSystemWakeEvent.cpp +++ b/src/system/tests/TestSystemWakeEvent.cpp @@ -21,10 +21,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/system/tests/TestTimeSource.cpp b/src/system/tests/TestTimeSource.cpp index 04b3c55f43303a..daee4cfb974f8b 100644 --- a/src/system/tests/TestTimeSource.cpp +++ b/src/system/tests/TestTimeSource.cpp @@ -21,10 +21,6 @@ * the ability to compile and use the test implementation of the time source. */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include diff --git a/src/tools/chip-cert/CertUtils.cpp b/src/tools/chip-cert/CertUtils.cpp index cb6e0a1703b434..ce8365bc9ef6bf 100644 --- a/src/tools/chip-cert/CertUtils.cpp +++ b/src/tools/chip-cert/CertUtils.cpp @@ -24,8 +24,6 @@ * */ -#define __STDC_FORMAT_MACROS - #include "chip-cert.h" #include #include diff --git a/src/tools/chip-cert/Cmd_GenAttCert.cpp b/src/tools/chip-cert/Cmd_GenAttCert.cpp index 3c30991dc9e8dc..fce4ff141674e1 100644 --- a/src/tools/chip-cert/Cmd_GenAttCert.cpp +++ b/src/tools/chip-cert/Cmd_GenAttCert.cpp @@ -23,10 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include "chip-cert.h" #include diff --git a/src/tools/chip-cert/Cmd_GenCD.cpp b/src/tools/chip-cert/Cmd_GenCD.cpp index acea3c5a1c4239..6d4e61159b7dea 100644 --- a/src/tools/chip-cert/Cmd_GenCD.cpp +++ b/src/tools/chip-cert/Cmd_GenCD.cpp @@ -23,10 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include "chip-cert.h" #include diff --git a/src/tools/chip-cert/Cmd_GenCert.cpp b/src/tools/chip-cert/Cmd_GenCert.cpp index 9bc74c9226e6f0..ae07f27cb599fa 100644 --- a/src/tools/chip-cert/Cmd_GenCert.cpp +++ b/src/tools/chip-cert/Cmd_GenCert.cpp @@ -24,10 +24,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include "chip-cert.h" namespace { diff --git a/src/tools/chip-cert/Cmd_ResignCert.cpp b/src/tools/chip-cert/Cmd_ResignCert.cpp index 425d295c918170..3e6d183a341734 100644 --- a/src/tools/chip-cert/Cmd_ResignCert.cpp +++ b/src/tools/chip-cert/Cmd_ResignCert.cpp @@ -24,10 +24,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include "chip-cert.h" namespace { diff --git a/src/tools/spake2p/Cmd_GenVerifier.cpp b/src/tools/spake2p/Cmd_GenVerifier.cpp index 04bfe995a91ead..7b4d7ce003ce95 100644 --- a/src/tools/spake2p/Cmd_GenVerifier.cpp +++ b/src/tools/spake2p/Cmd_GenVerifier.cpp @@ -23,10 +23,6 @@ * */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include "spake2p.h" #include diff --git a/src/transport/raw/tests/TestPeerAddress.cpp b/src/transport/raw/tests/TestPeerAddress.cpp index 8ad5380efa670d..6b7f9f886df085 100644 --- a/src/transport/raw/tests/TestPeerAddress.cpp +++ b/src/transport/raw/tests/TestPeerAddress.cpp @@ -17,14 +17,6 @@ * limitations under the License. */ -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif - -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif - #include #include #include