From 9ec4ca9c4d44c23ecbb642bf425b42019b97425d Mon Sep 17 00:00:00 2001 From: "serg@serg.mysql.com" <> Date: Tue, 9 Oct 2001 15:23:44 +0200 Subject: [PATCH] get rid of comp() macro - CMP is already in place --- include/my_global.h | 2 +- myisam/ft_boolean_search.c | 4 ++-- myisam/mi_search.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index c6c18a987e2..35b4ddcce16 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -276,7 +276,7 @@ typedef unsigned int uint; typedef unsigned short ushort; #endif -#define comp(a,b) (((a) < (b)) ? -1 : ((a) > (b)) ? 1 : 0) +#define CMP(a,b) (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1) #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0) #define swap(t,a,b) { register t dummy; dummy = a; a = b; b = dummy; } #define test(a) ((a) ? 1 : 0) diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index 32d8e7941bb..00f3ac8ff0a 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -87,9 +87,9 @@ typedef struct st_ft_info { int FTB_WORD_cmp(void *v, byte *a, byte *b) { /* ORDER BY docid, ndepth DESC */ - int i=comp(((FTB_WORD *)a)->docid, ((FTB_WORD *)b)->docid); + int i=CMP(((FTB_WORD *)a)->docid, ((FTB_WORD *)b)->docid); if (!i) - i=comp(((FTB_WORD *)b)->ndepth,((FTB_WORD *)a)->ndepth); + i=CMP(((FTB_WORD *)b)->ndepth,((FTB_WORD *)a)->ndepth); return i; } diff --git a/myisam/mi_search.c b/myisam/mi_search.c index 67db7c7110a..b0a0b06f499 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -19,8 +19,6 @@ #include "fulltext.h" #include "m_ctype.h" -#define CMP(a,b) (a