Don't define __STDC_{FORMAT,LIMIT}_MACROS (project-chip#32542)

ksperling-apple · web-flow · commit 64bf8cb18a20 · 2024-03-12T08:20:57.000Z
* 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
diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp
@@ -25,9 +25,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
 #include <stdint.h>
 #include <string.h>
 
diff --git 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 <stdint.h>
 
 #include <ble/BleConfig.h>
diff --git 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 <stdint.h>
 #include <string.h>
 
diff --git 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 <inttypes.h>
 #include <stdint.h>
 #include <string.h>
diff --git 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 <controller/CHIPDeviceController.h>
 
diff --git a/src/credentials/CHIPCert.cpp b/src/credentials/CHIPCert.cpp
@@ -25,10 +25,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <stddef.h>
 
 #include <credentials/CHIPCert_Internal.h>
diff --git a/src/credentials/CHIPCertFromX509.cpp b/src/credentials/CHIPCertFromX509.cpp
@@ -24,10 +24,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <stddef.h>
 
 #include <credentials/CHIPCert.h>
diff --git a/src/credentials/CHIPCertToX509.cpp b/src/credentials/CHIPCertToX509.cpp
@@ -24,10 +24,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <inttypes.h>
 #include <stddef.h>
 
diff --git a/src/credentials/GenerateChipX509Cert.cpp b/src/credentials/GenerateChipX509Cert.cpp
@@ -22,10 +22,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <algorithm>
 #include <initializer_list>
 #include <inttypes.h>
diff --git 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 <limits>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/inet/IPAddress.cpp b/src/inet/IPAddress.cpp
@@ -27,10 +27,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <inet/IPAddress.h>
 
 #include <inet/InetError.h>
diff --git a/src/inet/InetInterface.cpp b/src/inet/InetInterface.cpp
@@ -23,10 +23,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <inet/InetInterface.h>
 
 #include <inet/IPPrefix.h>
diff --git 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 <ctype.h>
 #include <time.h>
 
diff --git 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 <assert.h>
diff --git 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
@@ -24,10 +24,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <errno.h>
 #include <inttypes.h>
 #include <stdint.h>
diff --git 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 <inttypes.h>
 #include <stdint.h>
 #include <string.h>
diff --git 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 <signal.h>
 #include <stdint.h>
 #include <string.h>
diff --git 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 <ctype.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/lib/core/ErrorStr.cpp b/src/lib/core/ErrorStr.cpp
@@ -17,10 +17,6 @@
  */
 #include <lib/core/ErrorStr.h>
 
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
 #include <lib/core/CHIPConfig.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/DLLUtil.h>
diff --git a/src/lib/core/TLVCircularBuffer.cpp b/src/lib/core/TLVCircularBuffer.cpp
@@ -28,10 +28,6 @@
  */
 #include <lib/core/TLVCircularBuffer.h>
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <lib/core/CHIPError.h>
 #include <lib/core/TLVReader.h>
 #include <lib/core/TLVTags.h>
diff --git a/src/lib/core/TLVDebug.cpp b/src/lib/core/TLVDebug.cpp
@@ -17,10 +17,6 @@
  */
 #include <lib/core/TLVDebug.h>
 
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
 #include <inttypes.h>
 
 #include <lib/core/CHIPError.h>
diff --git a/src/lib/core/TLVWriter.cpp b/src/lib/core/TLVWriter.cpp
@@ -17,10 +17,6 @@
  */
 #include <lib/core/TLVWriter.h>
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git 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 <inttypes.h>
 #include <stdint.h>
 #include <string.h>
diff --git 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 <ctype.h>
diff --git 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
@@ -23,9 +23,6 @@
  *
  */
 
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
 #include <limits>
 #include <stdint.h>
 #include <type_traits>
diff --git 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 <map>
 #include <string>
 
diff --git 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 <inttypes.h>
 #include <limits.h>
diff --git 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 <inttypes.h>
 #include <stdint.h>
diff --git 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 <errno.h>
 #include <inttypes.h>
 #include <memory>
diff --git 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 <cstring>
 #include <inttypes.h>
 #include <stddef.h>
diff --git 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 <system/SystemPacketBuffer.h>
diff --git a/src/system/SystemStats.h b/src/system/SystemStats.h
diff --git a/src/system/tests/TestSystemClock.cpp b/src/system/tests/TestSystemClock.cpp
diff --git a/src/system/tests/TestSystemErrorStr.cpp b/src/system/tests/TestSystemErrorStr.cpp
diff --git a/src/system/tests/TestSystemPacketBuffer.cpp b/src/system/tests/TestSystemPacketBuffer.cpp
diff --git a/src/system/tests/TestSystemTimer.cpp b/src/system/tests/TestSystemTimer.cpp
diff --git a/src/system/tests/TestSystemWakeEvent.cpp b/src/system/tests/TestSystemWakeEvent.cpp
diff --git a/src/system/tests/TestTimeSource.cpp b/src/system/tests/TestTimeSource.cpp
diff --git a/src/tools/chip-cert/CertUtils.cpp b/src/tools/chip-cert/CertUtils.cpp
diff --git a/src/tools/chip-cert/Cmd_GenAttCert.cpp b/src/tools/chip-cert/Cmd_GenAttCert.cpp
diff --git a/src/tools/chip-cert/Cmd_GenCD.cpp b/src/tools/chip-cert/Cmd_GenCD.cpp
diff --git a/src/tools/chip-cert/Cmd_GenCert.cpp b/src/tools/chip-cert/Cmd_GenCert.cpp
diff --git a/src/tools/chip-cert/Cmd_ResignCert.cpp b/src/tools/chip-cert/Cmd_ResignCert.cpp
diff --git a/src/tools/spake2p/Cmd_GenVerifier.cpp b/src/tools/spake2p/Cmd_GenVerifier.cpp
diff --git a/src/transport/raw/tests/TestPeerAddress.cpp b/src/transport/raw/tests/TestPeerAddress.cpp

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@`
`25`	`25`	`*`
`26`	`26`	`*/`
`27`	`27`
`28`		`-#ifndef __STDC_LIMIT_MACROS`
`29`		`-#define __STDC_LIMIT_MACROS`
`30`		`-#endif`
`31`	`28`	`#include <stdint.h>`
`32`	`29`	`#include <string.h>`
`33`	`30`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,6 @@`
`25`	`25`	`*`
`26`	`26`	`*/`
`27`	`27`
`28`		`-#ifndef __STDC_LIMIT_MACROS`
`29`		`-#define __STDC_LIMIT_MACROS`
`30`		`-#endif`
`31`		`-`
`32`	`28`	`#include <stddef.h>`
`33`	`29`
`34`	`30`	`#include <credentials/CHIPCert_Internal.h>`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,6 @@`
`24`	`24`	`*`
`25`	`25`	`*/`
`26`	`26`
`27`		`-#ifndef __STDC_LIMIT_MACROS`
`28`		`-#define __STDC_LIMIT_MACROS`
`29`		`-#endif`
`30`		`-`
`31`	`27`	`#include <stddef.h>`
`32`	`28`
`33`	`29`	`#include <credentials/CHIPCert.h>`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@`
`23`	`23`	`*`
`24`	`24`	`*/`
`25`	`25`
`26`		`-#ifndef __STDC_LIMIT_MACROS`
`27`		`-#define __STDC_LIMIT_MACROS`
`28`		`-#endif`
`29`	`26`	`#include <limits>`
`30`	`27`	`#include <stdint.h>`
`31`	`28`	`#include <stdio.h>`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,6 @@`
`27`	`27`	`*`
`28`	`28`	`*/`
`29`	`29`
`30`		`-#ifndef __STDC_LIMIT_MACROS`
`31`		`-#define __STDC_LIMIT_MACROS`
`32`		`-#endif`
`33`		`-`
`34`	`30`	`#include <inet/IPAddress.h>`
`35`	`31`
`36`	`32`	`#include <inet/InetError.h>`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,6 @@`
`23`	`23`	`*`
`24`	`24`	`*/`
`25`	`25`
`26`		`-#ifndef __STDC_LIMIT_MACROS`
`27`		`-#define __STDC_LIMIT_MACROS`
`28`		`-#endif`
`29`		`-`
`30`	`26`	`#include <inet/InetInterface.h>`
`31`	`27`
`32`	`28`	`#include <inet/IPPrefix.h>`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,6 @@`
`24`	`24`	`*`
`25`	`25`	`*/`
`26`	`26`
`27`		`-#ifndef __STDC_LIMIT_MACROS`
`28`		`-#define __STDC_LIMIT_MACROS`
`29`		`-#endif`
`30`	`27`	`#include <ctype.h>`
`31`	`28`	`#include <stdint.h>`
`32`	`29`	`#include <stdio.h>`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@`
`22`	`22`	`*`
`23`	`23`	`*/`
`24`	`24`
`25`		`-#ifndef __STDC_LIMIT_MACROS`
`26`		`-#define __STDC_LIMIT_MACROS`
`27`		`-#endif`
`28`	`25`	`#include "Base64.h"`
`29`	`26`
`30`	`27`	`#include <ctype.h>`