get rid of comp() macro - CMP is already in place

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)

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;
 }
 

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);