From ede2cc9349c80dbfb554b4b44e7e98bb97e199e3 Mon Sep 17 00:00:00 2001 From: "Rob Swindell (on Windows 11)" <rob@synchro.net> Date: Thu, 26 Oct 2023 01:14:56 -0700 Subject: [PATCH] Don't try to include modern C++ headers when building C++ Builder C++ Builder6 doesn't have unordered_map, so only #include those std C++ headers if/where we actually need them. --- src/sbbs3/sbbs.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h index 0cb2d23453..f94663dd2c 100644 --- a/src/sbbs3/sbbs.h +++ b/src/sbbs3/sbbs.h @@ -26,11 +26,6 @@ /* Standard library headers */ /****************************/ -#if defined(__cplusplus) - #include <string> - #include <unordered_map> -#endif - /***************/ /* OS-specific */ /***************/ @@ -382,6 +377,9 @@ typedef struct js_callback { /* Synchronet Node Instance class definition */ #if defined(__cplusplus) && defined(JAVASCRIPT) +#include <string> +#include <unordered_map> + struct mouse_hotspot { // Mouse hot-spot char cmd[128]; int y; -- GitLab