From 93967a5e2b6fc7ae0f69b97b3be00f5591febf3e Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 7 Jan 2026 08:38:34 +0100
Subject: [PATCH] Use inlining also in a debug build

    * ACE/bin/MakeProjectCreator/config/acedefaults.mpb:

(cherry picked from commit 6c26ad02556a12631525984fc285666042fbb67e)

# Conflicts:
#	ACE/bin/MakeProjectCreator/config/acedefaults.mpb
---
 ACE/bin/MakeProjectCreator/config/acedefaults.mpb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index bcc17609a93c5..3ca88e752d057 100644
--- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -4,6 +4,13 @@ project: ipv6, vc_warnings, build_files, test_files, svc_conf_files, ace_unicode
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
 
+<<<<<<< HEAD
+=======
+  // Support the alternative Borland Make project type
+  specific(bmake) {
+    unicode_flags += -DACE_USES_WCHAR
+  }
+>>>>>>> 6c26ad0255 (Use inlining also in a debug build)
 
   specific(prop:microsoft) {
     macro_for_lib_modifier=1