Drop Borland compiler specific codeHEADmaster

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 26 insertions, 178 deletions

diff --git a/common/lzodefs.h b/common/lzodefs.h
index 81d9ad4..79ac460 100644
--- a/common/lzodefs.h
+++ b/common/lzodefs.h
@@ -69,9 +69,6 @@
 #    pragma warning 203 9
 #  endif
 #endif
-#if defined(__BORLANDC__) && defined(__MSDOS__) && !defined(__FLAT__)
-#  pragma option -h
-#endif
 #if !(LZO_CFG_NO_DISABLE_WCRTNONSTDC)
 #ifndef _CRT_NONSTDC_NO_DEPRECATE
 #define _CRT_NONSTDC_NO_DEPRECATE 1
@@ -152,8 +149,6 @@
 #    endif
 #  elif defined(__TSC__) && defined(__OS2__)
 #    define __LZO_RENAME_A 1
-#  elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410)
-#    define __LZO_RENAME_A 1
 #  elif defined(__PACIFIC__) && defined(DOS)
 #    if !defined(__far)
 #      define __far far
@@ -197,7 +192,7 @@
 #    if !defined(__pascal)
 #      define __pascal _pascal
 #    endif
-#  elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#  elif defined(__PUREC__) && defined(__TOS__)
 #    if !defined(__cdecl)
 #      define __cdecl cdecl
 #    endif
@@ -221,19 +216,7 @@
 #  endif
 #elif defined(__PACIFIC__) && defined(DOS)
 #  define LZO_BROKEN_INTEGRAL_CONSTANTS 1
-#elif defined(__TURBOC__) && defined(__MSDOS__)
-#  if (__TURBOC__ < 0x0150)
-#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
-#    define LZO_BROKEN_INTEGRAL_CONSTANTS 1
-#    define LZO_BROKEN_INTEGRAL_PROMOTION 1
-#  endif
-#  if (__TURBOC__ < 0x0200)
-#    define LZO_BROKEN_SIZEOF 1
-#  endif
-#  if (__TURBOC__ < 0x0400) && defined(__cplusplus)
-#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
-#  endif
-#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#elif defined(__PUREC__) && defined(__TOS__)
 #  define LZO_BROKEN_CDECL_ALT_SYNTAX 1
 #  define LZO_BROKEN_SIZEOF 1
 #endif
@@ -331,12 +314,6 @@
 #elif defined(__QNX__)
 #  define LZO_OS_QNX            1
 #  define LZO_INFO_OS           "qnx"
-#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460)
-#  define LZO_OS_DOS32          1
-#  define LZO_INFO_OS           "dos32"
-#elif defined(__BORLANDC__) && defined(__DPMI16__)
-#  define LZO_OS_DOS16          1
-#  define LZO_INFO_OS           "dos16"
 #elif defined(__ZTC__) && defined(DOS386)
 #  define LZO_OS_DOS32          1
 #  define LZO_INFO_OS           "dos32"
@@ -577,10 +554,6 @@
 #  define LZO_CC_CODEGEARC      1
 #  define LZO_INFO_CC           "CodeGear C"
 #  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__CODEGEARC__)
-#elif defined(__BORLANDC__)
-#  define LZO_CC_BORLANDC       1
-#  define LZO_INFO_CC           "Borland C"
-#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__BORLANDC__)
 #elif defined(_CRAYC) && defined(_RELEASE)
 #  define LZO_CC_CRAYC          1
 #  define LZO_INFO_CC           "Cray C"
@@ -705,10 +678,6 @@
 #  define LZO_CC_WATCOMC        1
 #  define LZO_INFO_CC           "Watcom C"
 #  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__WATCOMC__)
-#elif defined(__TURBOC__)
-#  define LZO_CC_TURBOC         1
-#  define LZO_INFO_CC           "Turbo C"
-#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TURBOC__)
 #elif defined(__ZTC__)
 #  define LZO_CC_ZORTECHC       1
 #  define LZO_INFO_CC           "Zortech C"
@@ -920,8 +889,6 @@
 #  define LZO_ARCH_I086PM           1
 #elif 1 && (LZO_OS_DOS16 && defined(DOSX286))
 #  define LZO_ARCH_I086PM           1
-#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__))
-#  define LZO_ARCH_I086PM           1
 #endif
 #if (LZO_ARCH_AMD64 && !LZO_ARCH_X64)
 #  define LZO_ARCH_X64              1
@@ -1094,8 +1061,6 @@
 #  if (_MSC_VER < 600)
 #    undef LZO_HAVE_MM_HUGE_PTR
 #  endif
-#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295))
-#  undef LZO_HAVE_MM_HUGE_ARRAY
 #endif
 #if (LZO_ARCH_I086PM) && !(LZO_HAVE_MM_HUGE_PTR)
 #  if (LZO_OS_DOS16)
@@ -1108,19 +1073,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
-   extern void __near __cdecl _AHSHIFT(void);
-#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+#if (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
    extern void __near __cdecl _AHSHIFT(void);
 #  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
 #elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC)
    extern void __near __cdecl _AHSHIFT(void);
 #  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295))
-   extern void __near __cdecl _AHSHIFT(void);
-#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16)
+#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC) && LZO_OS_DOS16)
 #  define LZO_MM_AHSHIFT      12
 #elif (LZO_CC_WATCOMC)
    extern unsigned char _HShift;
@@ -1345,9 +1304,7 @@ extern "C" {
 #  define LZO_BLOCK_END             } while __lzo_cte(0)
 #endif
 #if !defined(LZO_UNUSED)
-#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
-#    define LZO_UNUSED(var)         ((void) &var)
-#  elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC)
+#  if (LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC)
 #    define LZO_UNUSED(var)         if (&var) ; else
 #  elif (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030200ul))
 #    define LZO_UNUSED(var)         ((void) &var)
@@ -1366,9 +1323,7 @@ extern "C" {
 #  endif
 #endif
 #if !defined(LZO_UNUSED_FUNC)
-#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
-#    define LZO_UNUSED_FUNC(func)   ((void) func)
-#  elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC)
+#  if (LZO_CC_NDPC)
 #    define LZO_UNUSED_FUNC(func)   if (func) ; else
 #  elif (LZO_CC_CLANG || LZO_CC_LLVM)
 #    define LZO_UNUSED_FUNC(func)   ((void) &func)
@@ -1401,13 +1356,10 @@ extern "C" {
 #  endif
 #endif
 #if !defined(__lzo_inline)
-#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295))
-#elif defined(__cplusplus)
+#if defined(__cplusplus)
 #  define __lzo_inline          inline
 #elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L)
 #  define __lzo_inline          inline
-#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550))
-#  define __lzo_inline          __inline
 #elif (LZO_CC_ARMCC_GNUC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI)
 #  define __lzo_inline          __inline__
 #elif (LZO_CC_DMC)
@@ -1848,8 +1800,6 @@ extern "C" {
 #    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END
 #  elif (LZO_CC_DMC || LZO_CC_SYMANTECC)
 #    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1u-2*!(e)]; LZO_EXTERN_C_END
-#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
-#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END
 #  elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020900ul)) && defined(__cplusplus)
 #    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN int __LZO_CTA_NAME(lzo_cta_f__)(int [1-2*!(e)]); LZO_EXTERN_C_END
 #  elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__)
@@ -1871,8 +1821,6 @@ extern "C" {
 #    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)] __attribute__((__unused__));}
 #  elif (LZO_CC_MSC && (_MSC_VER < 900))
 #    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
-#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
-#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
 #  else
 #    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];}
 #  endif
@@ -1923,7 +1871,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3)
 #  endif
 #elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC)
 #  define __lzo_cdecl                   __cdecl
-#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC))
+#elif LZO_ARCH_M68K && LZO_OS_TOS && LZO_CC_PUREC
 #  define __lzo_cdecl                   cdecl
 #endif
 #if !defined(__lzo_cdecl)
@@ -2119,8 +2067,6 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long))
 #  define LZO_SIZEOF___INT64        8
 #elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC))
 #  define LZO_SIZEOF___INT64        8
-#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520)))
-#  define LZO_SIZEOF___INT64        8
 #elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100)))
 #  define LZO_SIZEOF___INT64        8
 #elif (LZO_CC_GHS && defined(__LLONG_BIT) && ((__LLONG_BIT-0) == 64))
@@ -2269,11 +2215,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SIZE_T == sizeof(size_t))
 #  if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE)
 #    define LZO_SIZEOF_PTRDIFF_T    LZO_SIZEOF_VOID_P
 #  elif (LZO_MM_COMPACT || LZO_MM_LARGE)
-#    if (LZO_CC_BORLANDC || LZO_CC_TURBOC)
-#      define LZO_SIZEOF_PTRDIFF_T  4
-#    else
-#      define LZO_SIZEOF_PTRDIFF_T  2
-#    endif
+#    define LZO_SIZEOF_PTRDIFF_T  2
 #  else
 #    error "invalid LZO_ARCH_I086 memory model"
 #  endif
@@ -2695,11 +2637,6 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
    LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == LZO_SIZEOF_LZO_INT32E_T)
 #endif
 #if !defined(lzo_int64e_t)
-#if (LZO_SIZEOF___INT64 == 8)
-#  if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64)
-#    define LZO_CFG_TYPE_PREFER___INT64 1
-#  endif
-#endif
 #if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG)
 #  define lzo_int64e_t              int
 #  define lzo_uint64e_t             unsigned int
@@ -2711,27 +2648,14 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64)
 #  define lzo_int64e_t              lzo_llong_t
 #  define lzo_uint64e_t             lzo_ullong_t
-#  if (LZO_CC_BORLANDC)
-#    define LZO_INT64_C(c)          ((c) + 0ll)
-#    define LZO_UINT64_C(c)         ((c) + 0ull)
-#  elif 0
-#    define LZO_INT64_C(c)          (__lzo_gnuc_extension__ (c##LL))
-#    define LZO_UINT64_C(c)         (__lzo_gnuc_extension__ (c##ULL))
-#  else
-#    define LZO_INT64_C(c)          (c##LL)
-#    define LZO_UINT64_C(c)         (c##ULL)
-#  endif
+#  define LZO_INT64_C(c)            (c##LL)
+#  define LZO_UINT64_C(c)           (c##ULL)
 #  define LZO_SIZEOF_LZO_INT64E_T   LZO_SIZEOF_LONG_LONG
 #elif (LZO_SIZEOF___INT64 == 8)
 #  define lzo_int64e_t              __int64
 #  define lzo_uint64e_t             unsigned __int64
-#  if (LZO_CC_BORLANDC)
-#    define LZO_INT64_C(c)          ((c) + 0i64)
-#    define LZO_UINT64_C(c)         ((c) + 0ui64)
-#  else
-#    define LZO_INT64_C(c)          (c##i64)
-#    define LZO_UINT64_C(c)         (c##ui64)
-#  endif
+#  define LZO_INT64_C(c)            (c##i64)
+#  define LZO_UINT64_C(c)           (c##ui64)
 #  define LZO_SIZEOF_LZO_INT64E_T   LZO_SIZEOF___INT64
 #else
 #endif
diff --git a/common/minilzo.c b/common/minilzo.c
index 2651317..1a3b518 100644
--- a/common/minilzo.c
+++ b/common/minilzo.c
@@ -89,9 +89,6 @@
 #    pragma warning 203 9
 #  endif
 #endif
-#if defined(__BORLANDC__) && defined(__MSDOS__) && !defined(__FLAT__)
-#  pragma option -h
-#endif
 #if !(LZO_CFG_NO_DISABLE_WCRTNONSTDC)
 #ifndef _CRT_NONSTDC_NO_DEPRECATE
 #define _CRT_NONSTDC_NO_DEPRECATE 1
@@ -172,8 +169,6 @@
 #    endif
 #  elif defined(__TSC__) && defined(__OS2__)
 #    define __LZO_RENAME_A 1
-#  elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410)
-#    define __LZO_RENAME_A 1
 #  elif defined(__PACIFIC__) && defined(DOS)
 #    if !defined(__far)
 #      define __far far
@@ -217,7 +212,7 @@
 #    if !defined(__pascal)
 #      define __pascal _pascal
 #    endif
-#  elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#  elif defined(__PUREC__) && defined(__TOS__)
 #    if !defined(__cdecl)
 #      define __cdecl cdecl
 #    endif
@@ -241,19 +236,7 @@
 #  endif
 #elif defined(__PACIFIC__) && defined(DOS)
 #  define LZO_BROKEN_INTEGRAL_CONSTANTS 1
-#elif defined(__TURBOC__) && defined(__MSDOS__)
-#  if (__TURBOC__ < 0x0150)
-#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
-#    define LZO_BROKEN_INTEGRAL_CONSTANTS 1
-#    define LZO_BROKEN_INTEGRAL_PROMOTION 1
-#  endif
-#  if (__TURBOC__ < 0x0200)
-#    define LZO_BROKEN_SIZEOF 1
-#  endif
-#  if (__TURBOC__ < 0x0400) && defined(__cplusplus)
-#    define LZO_BROKEN_CDECL_ALT_SYNTAX 1
-#  endif
-#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
+#elif defined(__PUREC__) && defined(__TOS__)
 #  define LZO_BROKEN_CDECL_ALT_SYNTAX 1
 #  define LZO_BROKEN_SIZEOF 1
 #endif
@@ -351,12 +334,6 @@
 #elif defined(__QNX__)
 #  define LZO_OS_QNX            1
 #  define LZO_INFO_OS           "qnx"
-#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460)
-#  define LZO_OS_DOS32          1
-#  define LZO_INFO_OS           "dos32"
-#elif defined(__BORLANDC__) && defined(__DPMI16__)
-#  define LZO_OS_DOS16          1
-#  define LZO_INFO_OS           "dos16"
 #elif defined(__ZTC__) && defined(DOS386)
 #  define LZO_OS_DOS32          1
 #  define LZO_INFO_OS           "dos32"
@@ -597,10 +574,6 @@
 #  define LZO_CC_CODEGEARC      1
 #  define LZO_INFO_CC           "CodeGear C"
 #  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__CODEGEARC__)
-#elif defined(__BORLANDC__)
-#  define LZO_CC_BORLANDC       1
-#  define LZO_INFO_CC           "Borland C"
-#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__BORLANDC__)
 #elif defined(_CRAYC) && defined(_RELEASE)
 #  define LZO_CC_CRAYC          1
 #  define LZO_INFO_CC           "Cray C"
@@ -725,10 +698,6 @@
 #  define LZO_CC_WATCOMC        1
 #  define LZO_INFO_CC           "Watcom C"
 #  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__WATCOMC__)
-#elif defined(__TURBOC__)
-#  define LZO_CC_TURBOC         1
-#  define LZO_INFO_CC           "Turbo C"
-#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__TURBOC__)
 #elif defined(__ZTC__)
 #  define LZO_CC_ZORTECHC       1
 #  define LZO_INFO_CC           "Zortech C"
@@ -940,8 +909,6 @@
 #  define LZO_ARCH_I086PM           1
 #elif 1 && (LZO_OS_DOS16 && defined(DOSX286))
 #  define LZO_ARCH_I086PM           1
-#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__))
-#  define LZO_ARCH_I086PM           1
 #endif
 #if (LZO_ARCH_AMD64 && !LZO_ARCH_X64)
 #  define LZO_ARCH_X64              1
@@ -1114,8 +1081,6 @@
 #  if (_MSC_VER < 600)
 #    undef LZO_HAVE_MM_HUGE_PTR
 #  endif
-#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295))
-#  undef LZO_HAVE_MM_HUGE_ARRAY
 #endif
 #if (LZO_ARCH_I086PM) && !(LZO_HAVE_MM_HUGE_PTR)
 #  if (LZO_OS_DOS16)
@@ -1128,19 +1093,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
-   extern void __near __cdecl _AHSHIFT(void);
-#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
+#if (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
    extern void __near __cdecl _AHSHIFT(void);
 #  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
 #elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC)
    extern void __near __cdecl _AHSHIFT(void);
 #  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295))
-   extern void __near __cdecl _AHSHIFT(void);
-#  define LZO_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16)
+#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC) && LZO_OS_DOS16)
 #  define LZO_MM_AHSHIFT      12
 #elif (LZO_CC_WATCOMC)
    extern unsigned char _HShift;
@@ -1365,9 +1324,7 @@ extern "C" {
 #  define LZO_BLOCK_END             } while __lzo_cte(0)
 #endif
 #if !defined(LZO_UNUSED)
-#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
-#    define LZO_UNUSED(var)         ((void) &var)
-#  elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC)
+#  if (LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC)
 #    define LZO_UNUSED(var)         if (&var) ; else
 #  elif (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030200ul))
 #    define LZO_UNUSED(var)         ((void) &var)
@@ -1386,9 +1343,7 @@ extern "C" {
 #  endif
 #endif
 #if !defined(LZO_UNUSED_FUNC)
-#  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
-#    define LZO_UNUSED_FUNC(func)   ((void) func)
-#  elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC)
+#  if (LZO_CC_NDPC)
 #    define LZO_UNUSED_FUNC(func)   if (func) ; else
 #  elif (LZO_CC_CLANG || LZO_CC_LLVM)
 #    define LZO_UNUSED_FUNC(func)   ((void) &func)
@@ -1421,13 +1376,10 @@ extern "C" {
 #  endif
 #endif
 #if !defined(__lzo_inline)
-#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295))
-#elif defined(__cplusplus)
+#if defined(__cplusplus)
 #  define __lzo_inline          inline
 #elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L)
 #  define __lzo_inline          inline
-#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550))
-#  define __lzo_inline          __inline
 #elif (LZO_CC_ARMCC_GNUC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI)
 #  define __lzo_inline          __inline__
 #elif (LZO_CC_DMC)
@@ -1868,8 +1820,6 @@ extern "C" {
 #    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END
 #  elif (LZO_CC_DMC || LZO_CC_SYMANTECC)
 #    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1u-2*!(e)]; LZO_EXTERN_C_END
-#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
-#    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END
 #  elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020900ul)) && defined(__cplusplus)
 #    define LZO_COMPILE_TIME_ASSERT_HEADER(e)  LZO_EXTERN_C_BEGIN int __LZO_CTA_NAME(lzo_cta_f__)(int [1-2*!(e)]); LZO_EXTERN_C_END
 #  elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__)
@@ -1891,8 +1841,6 @@ extern "C" {
 #    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)] __attribute__((__unused__));}
 #  elif (LZO_CC_MSC && (_MSC_VER < 900))
 #    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
-#  elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295))
-#    define LZO_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
 #  else
 #    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];}
 #  endif
@@ -1943,7 +1891,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3)
 #  endif
 #elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC)
 #  define __lzo_cdecl                   __cdecl
-#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC))
+#elif LZO_ARCH_M68K && LZO_OS_TOS && LZO_CC_PUREC
 #  define __lzo_cdecl                   cdecl
 #endif
 #if !defined(__lzo_cdecl)
@@ -2139,8 +2087,6 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long))
 #  define LZO_SIZEOF___INT64        8
 #elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC))
 #  define LZO_SIZEOF___INT64        8
-#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520)))
-#  define LZO_SIZEOF___INT64        8
 #elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100)))
 #  define LZO_SIZEOF___INT64        8
 #elif (LZO_CC_GHS && defined(__LLONG_BIT) && ((__LLONG_BIT-0) == 64))
@@ -2289,11 +2235,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SIZE_T == sizeof(size_t))
 #  if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE)
 #    define LZO_SIZEOF_PTRDIFF_T    LZO_SIZEOF_VOID_P
 #  elif (LZO_MM_COMPACT || LZO_MM_LARGE)
-#    if (LZO_CC_BORLANDC || LZO_CC_TURBOC)
-#      define LZO_SIZEOF_PTRDIFF_T  4
-#    else
-#      define LZO_SIZEOF_PTRDIFF_T  2
-#    endif
+#    define LZO_SIZEOF_PTRDIFF_T  2
 #  else
 #    error "invalid LZO_ARCH_I086 memory model"
 #  endif
@@ -2715,11 +2657,6 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
    LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == LZO_SIZEOF_LZO_INT32E_T)
 #endif
 #if !defined(lzo_int64e_t)
-#if (LZO_SIZEOF___INT64 == 8)
-#  if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64)
-#    define LZO_CFG_TYPE_PREFER___INT64 1
-#  endif
-#endif
 #if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG)
 #  define lzo_int64e_t              int
 #  define lzo_uint64e_t             unsigned int
@@ -2731,27 +2668,14 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64)
 #  define lzo_int64e_t              lzo_llong_t
 #  define lzo_uint64e_t             lzo_ullong_t
-#  if (LZO_CC_BORLANDC)
-#    define LZO_INT64_C(c)          ((c) + 0ll)
-#    define LZO_UINT64_C(c)         ((c) + 0ull)
-#  elif 0
-#    define LZO_INT64_C(c)          (__lzo_gnuc_extension__ (c##LL))
-#    define LZO_UINT64_C(c)         (__lzo_gnuc_extension__ (c##ULL))
-#  else
-#    define LZO_INT64_C(c)          (c##LL)
-#    define LZO_UINT64_C(c)         (c##ULL)
-#  endif
+#  define LZO_INT64_C(c)            (c##LL)
+#  define LZO_UINT64_C(c)           (c##ULL)
 #  define LZO_SIZEOF_LZO_INT64E_T   LZO_SIZEOF_LONG_LONG
 #elif (LZO_SIZEOF___INT64 == 8)
 #  define lzo_int64e_t              __int64
 #  define lzo_uint64e_t             unsigned __int64
-#  if (LZO_CC_BORLANDC)
-#    define LZO_INT64_C(c)          ((c) + 0i64)
-#    define LZO_UINT64_C(c)         ((c) + 0ui64)
-#  else
-#    define LZO_INT64_C(c)          (c##i64)
-#    define LZO_UINT64_C(c)         (c##ui64)
-#  endif
+#  define LZO_INT64_C(c)            (c##i64)
+#  define LZO_UINT64_C(c)           (c##ui64)
 #  define LZO_SIZEOF_LZO_INT64E_T   LZO_SIZEOF___INT64
 #else
 #endif