diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-09 15:23:44 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-09 15:23:44 +0200 |
| commit | 93cc6444ccad2ace36ba354cd96ffe8ede676761 (patch) | |
| tree | 9246142fc630888d9df22974741b24594d61b55a | |
| parent | c561a6f2a67595d80eeed4401251d99726d494ac (diff) | |
| download | mariadb-git-93cc6444ccad2ace36ba354cd96ffe8ede676761.tar.gz | |
get rid of comp() macro - CMP is already in place
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | myisam/ft_boolean_search.c | 4 | ||||
| -rw-r--r-- | 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<b ? -1 : a == b ? 0 : 1) - static my_bool _mi_get_prev_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key, uchar *keypos, uint *return_key_length); |