From 78ed8bf6741dcd782f5d1d0a754e2df70dc973bb Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Thu, 24 Jun 1999 02:58:29 +0000 Subject: [PATCH] See ChangeLog entry 19990623-21:50 EDT David G. Holm --- harbour/ChangeLog | 6 ++++++ harbour/include/hbsetup.h | 15 --------------- harbour/source/rtl/strcmp.c | 9 --------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 29bdbdcac4..d2753a0174 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +19990623-21:50 EDT David G. Holm + Oops! I accidentally left the HB_USE_STRICMP and HB_USE_STRCASECMP + stuff in these two files. It's really gone now... + * include/hbsetup.h + * source/rtl/strcmp.c + 19990623-21:30 EDT David G. Holm * makefile.b31 - Added support for source/rtl/copyfile.c diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index eaed03a51d..7811b79936 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -38,21 +38,6 @@ */ /*#define HB_STRICT_CLIPPER_COMPATIBILITY*/ -/* This symbol defines if you want to have hb_stricmp() use stricmp() - * - * By default it is disabled (symbol is not defined) -*/ -/*#define HB_USE_STRICMP*/ - -/* This symbol defines if you want to have hb_stricmp() use strcasecmp() - * - * By default it is disabled (symbol is not defined) - * - * If you define both HB_USE_STRICMP and HB_USE_STRCASECMP, HB_USE_STRICMP - * will take precedence over HB_USE_STRCASECMP -*/ -/*#define HB_USE_STRCASECMP*/ - /* This symbol defines if we want to use the GT API * * By default it is disabled (symbol is not defined) diff --git a/harbour/source/rtl/strcmp.c b/harbour/source/rtl/strcmp.c index b847498e36..9f97eaca9e 100644 --- a/harbour/source/rtl/strcmp.c +++ b/harbour/source/rtl/strcmp.c @@ -9,12 +9,6 @@ int hb_stricmp( const char *s1, const char *s2 ) { -#ifdef HB_USE_STRICMP - return( stricmp( s1, s2 ) ); -#else -#ifdef HB_USE_STRCASECMP - return( strcasecmp( s1, s2 ) ); -#else int rc = 0, c1, c2; USHORT l1, l2, count; l1 = strlen( s1 ); @@ -34,8 +28,6 @@ int hb_stricmp( const char *s1, const char *s2 ) else rc = 1; } return rc; -#endif -#endif } /* Check whether two strings are equal (0), smaller (-1), or greater (1) */ @@ -89,4 +81,3 @@ int hb_itemStrCmp( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact ) } return(iRet); } -