Commit 6e02272a authored by Mikael Ronstrom's avatar Mikael Ronstrom

WL#5105, review fix

parent 5a1ac833
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "mysys_priv.h" #include "mysys_priv.h"
#include <myisampack.h> #include <myisampack.h>
#ifdef UNIV_SOLARIS #ifdef TARGET_OS_SOLARIS
/* /*
* On Solaris, memcmp() is normally faster than the unrolled ptr_compare_N * On Solaris, memcmp() is normally faster than the unrolled ptr_compare_N
* functions, as memcmp() is usually a platform-specific implementation * functions, as memcmp() is usually a platform-specific implementation
...@@ -39,20 +39,20 @@ static int native_compare(size_t *length, unsigned char **a, unsigned char **b) ...@@ -39,20 +39,20 @@ static int native_compare(size_t *length, unsigned char **a, unsigned char **b)
return memcmp(*a, *b, *length); return memcmp(*a, *b, *length);
} }
#else /* UNIV_SOLARIS */ #else /* TARGET_OS_SOLARIS */
static int ptr_compare(size_t *compare_length, uchar **a, uchar **b); static int ptr_compare(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_0(size_t *compare_length, uchar **a, uchar **b); static int ptr_compare_0(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_1(size_t *compare_length, uchar **a, uchar **b); static int ptr_compare_1(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_2(size_t *compare_length, uchar **a, uchar **b); static int ptr_compare_2(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_3(size_t *compare_length, uchar **a, uchar **b); static int ptr_compare_3(size_t *compare_length, uchar **a, uchar **b);
#endif /* UNIV_SOLARIS */ #endif /* TARGET_OS_SOLARIS */
/* Get a pointer to a optimal byte-compare function for a given size */ /* Get a pointer to a optimal byte-compare function for a given size */
qsort2_cmp get_ptr_compare (size_t size) qsort2_cmp get_ptr_compare (size_t size)
{ {
#ifdef UNIV_SOLARIS #ifdef TARGET_OS_SOLARIS
return (qsort2_cmp) native_compare; return (qsort2_cmp) native_compare;
#else #else
if (size < 4) if (size < 4)
...@@ -64,7 +64,7 @@ qsort2_cmp get_ptr_compare (size_t size) ...@@ -64,7 +64,7 @@ qsort2_cmp get_ptr_compare (size_t size)
case 3: return (qsort2_cmp) ptr_compare_3; case 3: return (qsort2_cmp) ptr_compare_3;
} }
return 0; /* Impossible */ return 0; /* Impossible */
#endif /* UNIV_SOLARIS */ #endif /* TARGET_OS_SOLARIS */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment