From 950f173e3c879022c30235fec67738f9f96dfc7a Mon Sep 17 00:00:00 2001 From: Ricky Gonzales Date: Mon, 6 Mar 2000 17:16:12 +0000 Subject: [PATCH] Compilation fix for BC++ 5.5 This is partial cherry-pick of a6e2b3a8316c430a68f91b3c894e856987dd972e from the main repository. --- jmorecfg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jmorecfg.h b/jmorecfg.h index 8275eb0..4bec0e8 100644 --- a/jmorecfg.h +++ b/jmorecfg.h @@ -158,12 +158,12 @@ typedef short INT16; /* INT32 must hold at least signed 32-bit values. */ /* Modified JACS 23/4/99. 1200 means VC++ 6 */ -#if !defined(XMD_H) && !(_MSC_VER >= 1200) /* X11/xmd.h correctly defines INT32 */ +#if !defined(XMD_H) && !(_MSC_VER >= 1200) && !(__BORLANDC__ >= 0x550) /* X11/xmd.h correctly defines INT32 */ typedef long INT32; #endif /* Added JACS 23/4/99, to get INT32 definition */ -#if (_MSC_VER >= 1200) +#if (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) #include #endif