From 47a12c30ca7a8e4159e25209b0fe746313fb513f Mon Sep 17 00:00:00 2001
From: "Sergio R. Caprile" <scaprile@cesanta.com>
Date: Tue, 1 Nov 2022 21:01:33 -0300
Subject: [PATCH] mongoose_custom.h not pulled in when MG_ARCH=MG_ARCH_CUSTOM

---
 docs/README.md | 7 ++++++-
 mongoose.h     | 2 +-
 src/arch.h     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 43e80f24..c1da54f1 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -334,7 +334,7 @@ accordingly.
 
 ## Custom build
 
-A custom build should be used for cases which is not covered by the
+A custom build should be used for cases not covered by the
 existing architecture options (e.g., an embedded architecture that
 uses some proprietary RTOS and network stack). In order to build on such
 systems, follow the outline below:
@@ -352,6 +352,11 @@ you have enabled - see previous section. Below is an example:
 #define MG_DIRSEP '/'
 #define MG_INT64_FMT "%lld"
 ```
+You can also add
+```c
+#define MG_ARCH MG_ARCH_CUSTOM
+```
+To this file, instead of adding build flags.
 3. This step is optional, and only required if you intend to use a custom
    TCP/IP stack. To do that, you should:
   * Disable BSD socket API: in the `mongoose_custom.h`, add
diff --git a/mongoose.h b/mongoose.h
index d9bd8024..575e6a30 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -61,7 +61,7 @@ extern "C" {
 #define MG_ARCH MG_ARCH_RP2040
 #endif
 
-#if !defined(MG_ARCH)
+#if !defined(MG_ARCH) || (MG_ARCH == MG_ARCH_CUSTOM)
 #include "mongoose_custom.h"  // keep this include
 #endif
 
diff --git a/src/arch.h b/src/arch.h
index 20852735..2f9001b5 100644
--- a/src/arch.h
+++ b/src/arch.h
@@ -34,7 +34,7 @@
 #define MG_ARCH MG_ARCH_RP2040
 #endif
 
-#if !defined(MG_ARCH)
+#if !defined(MG_ARCH) || (MG_ARCH == MG_ARCH_CUSTOM)
 #include "mongoose_custom.h"  // keep this include
 #endif