diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-11-20 20:01:43 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-11-20 20:01:43 +0100 |
| commit | 6e02272abb2789766180c9b1dc4a906337368d78 (patch) | |
| tree | bc49d2362cafddfd937f99f878889ad685603e3e /mysys/ptr_cmp.c | |
| parent | 5a1ac833261a68566a82d163f268ad80597889ac (diff) | |
| download | mariadb-git-6e02272abb2789766180c9b1dc4a906337368d78.tar.gz | |
WL#5105, review fix
Diffstat (limited to 'mysys/ptr_cmp.c')
| -rw-r--r-- | mysys/ptr_cmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/ptr_cmp.c b/mysys/ptr_cmp.c index 9f053f0b3b4..2005e3eb2b7 100644 --- a/mysys/ptr_cmp.c +++ b/mysys/ptr_cmp.c @@ -22,7 +22,7 @@ #include "mysys_priv.h" #include <myisampack.h> -#ifdef UNIV_SOLARIS +#ifdef TARGET_OS_SOLARIS /* * On Solaris, memcmp() is normally faster than the unrolled ptr_compare_N * 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) 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_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_2(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 */ qsort2_cmp get_ptr_compare (size_t size) { -#ifdef UNIV_SOLARIS +#ifdef TARGET_OS_SOLARIS return (qsort2_cmp) native_compare; #else if (size < 4) @@ -64,7 +64,7 @@ qsort2_cmp get_ptr_compare (size_t size) case 3: return (qsort2_cmp) ptr_compare_3; } return 0; /* Impossible */ -#endif /* UNIV_SOLARIS */ +#endif /* TARGET_OS_SOLARIS */ } |