From d6b7e998eb358ab8edca75b69a03d3f1f8cf2d57 Mon Sep 17 00:00:00 2001
From: Bill-Gray <pluto@projectpluto.com>
Date: Mon, 29 Jul 2024 20:14:57 -0400
Subject: [PATCH] WinCon and WinGUI Borland Turbo C makefiles now specify the
 lack of a 'stdint.h'.  If you build with -DUTF8,  you need not add -DWIDE
 (this has been the case with most makefiles for a long time,  but we'd not
 caught up on the Borland ones until now).

---
 wincon/Makefile.bcc | 12 ++++++------
 wingui/Makefile.bcc | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wincon/Makefile.bcc b/wincon/Makefile.bcc
index 0dc4e5fb..ea02f16a 100644
--- a/wincon/Makefile.bcc
+++ b/wincon/Makefile.bcc
@@ -21,17 +21,17 @@ osdir		= $(PDCURSES_SRCDIR)\wincon
 CC		= bcc32c -q
 
 !ifdef DEBUG
-CFLAGS		= -N -v -y -DPDCDEBUG
+CFLAGS		= -N -v -y -DPDCDEBUG -DNO_STDINT_H
 !else
-CFLAGS		= -O
+CFLAGS		= -O -DNO_STDINT_H
 !endif
 
+!ifdef UTF8
+WIDEOPT		= -DPDC_WIDE -DPDC_FORCE_UTF8
+!else
 !ifdef WIDE
 WIDEOPT		= -DPDC_WIDE
 !endif
-
-!ifdef UTF8
-UTF8OPT		= -DPDC_FORCE_UTF8
 !endif
 
 !ifdef INFOEX
@@ -39,7 +39,7 @@ INFOPT          = -DHAVE_NO_INFOEX
 !endif
 
 BUILD		= $(CC) -I$(PDCURSES_SRCDIR) -c -Tpe $(CFLAGS) \
-$(WIDEOPT) $(UTF8OPT) $(INFOPT)
+$(WIDEOPT) $(INFOPT)
 BUILD_OS	= $(BUILD) -Xdriver -Wno-deprecated-declarations
 
 LIBEXE		= tlib /C /E /0 /a
diff --git a/wingui/Makefile.bcc b/wingui/Makefile.bcc
index dee2fc8b..e576adae 100644
--- a/wingui/Makefile.bcc
+++ b/wingui/Makefile.bcc
@@ -20,21 +20,21 @@ common		= $(PDCURSES_SRCDIR)\common
 CC		= bcc32 -q
 
 !ifdef DEBUG
-CFLAGS		= -N -v -y -DPDCDEBUG
+CFLAGS		= -N -v -y -DPDCDEBUG -DNO_STDINT_H
 !else
-CFLAGS		= -O
+CFLAGS		= -O -DNO_STDINT_H
 !endif
 
+!ifdef UTF8
+WIDEOPT		= -DPDC_WIDE -DPDC_FORCE_UTF8
+!else
 !ifdef WIDE
 WIDEOPT		= -DPDC_WIDE
 !endif
-
-!ifdef UTF8
-UTF8OPT		= -DPDC_FORCE_UTF8
 !endif
 
 BUILD		= $(CC) -I$(PDCURSES_SRCDIR) -c -Tpe -w32 $(CFLAGS) -w-par \
-$(WIDEOPT) $(UTF8OPT)
+$(WIDEOPT)
 
 LIBEXE		= tlib /C /E /0 /a