Enable -Wundef by default.

* Fixes project-chip#29216 * Fixes project-chip#29209
bzbarsky-apple · Oct 5, 2023 · cde780a · cde780a
1 parent a75d2e5
commit cde780a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
@@ -235,6 +235,7 @@ config("strict_warnings") {
   cflags = [
     "-Wextra",
     "-Wshadow",
+    "-Wundef",
     "-Wunreachable-code",
     "-Wvla",
     "-Wformat",

diff --git a/src/inet/InetInterface.cpp b/src/inet/InetInterface.cpp
@@ -502,7 +502,7 @@ void CloseIOCTLSocket()
     }
 }
 
-#if __ANDROID__
+#ifdef __ANDROID__
 
 static struct if_nameindex * backport_if_nameindex(void);
 static void backport_if_freenameindex(struct if_nameindex *);
@@ -648,7 +648,7 @@ InterfaceIterator::~InterfaceIterator()
 {
     if (mIntfArray != nullptr)
     {
-#if __ANDROID__
+#ifdef __ANDROID__
         backport_if_freenameindex(mIntfArray);
 #else
         if_freenameindex(mIntfArray);
@@ -666,7 +666,7 @@ bool InterfaceIterator::Next()
 {
     if (mIntfArray == nullptr)
     {
-#if __ANDROID__
+#ifdef __ANDROID__
         mIntfArray = backport_if_nameindex();
 #else
         mIntfArray = if_nameindex();

diff --git a/src/lib/support/CHIPArgParser.hpp b/src/lib/support/CHIPArgParser.hpp
@@ -32,6 +32,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef CHIP_CONFIG_NON_POSIX_LONG_OPT
+#define CHIP_CONFIG_NON_POSIX_LONG_OPT 0
+#endif
+
 namespace chip {
 namespace ArgParser {
 

diff --git a/src/lib/support/UnitTestRegistration.cpp b/src/lib/support/UnitTestRegistration.cpp
@@ -32,7 +32,7 @@ typedef struct
 
 static test_suites_t gs_test_suites;
 
-#if __ZEPHYR__
+#ifdef __ZEPHYR__
 inline static bool AlreadyExists(UnitTestTriggerFunction tests)
 {
     for (uint32_t i = 0; i < gs_test_suites.num_test_suites; ++i)
@@ -50,7 +50,7 @@ CHIP_ERROR RegisterUnitTests(UnitTestTriggerFunction tests)
         return CHIP_ERROR_NO_MEMORY;
     }
 
-#if __ZEPHYR__
+#ifdef __ZEPHYR__
     // Not sure yet if it's a Zephyr bug or misconfiguration, but global constructors are called
     // twice on native_posix platform - by libc and by Zephyr's main thread initialization code.
     // This makes sure tests are not run twice for that reason.