diff options
| author | Monty <monty@mariadb.org> | 2018-04-30 15:21:52 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-04-30 15:21:52 +0300 |
| commit | a1fe7d75dc0468ebf2f31e6e7ddeef186abcd230 (patch) | |
| tree | 597212e3eec8fc08961f1d93e9d3caa52ff4db01 /storage/sphinx | |
| parent | 7d6b55b99aa11bc888bdf7ad1ccdf845909a91c5 (diff) | |
| download | mariadb-git-a1fe7d75dc0468ebf2f31e6e7ddeef186abcd230.tar.gz | |
Removed even more warning that was found with -Wunused
- Removed test if HA_FT_WTYPE == HA_KEYTYPE_FLOAT as this never worked
(HA_KEYTYPE_FLOAT is an enum)
- Define HA_FT_MAXLEN to 126 (was tested before but never defined)
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 4 | ||||
| -rw-r--r-- | storage/sphinx/snippets_udf.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index 0540ff082ce..3c6fb9ce6fc 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -17,7 +17,7 @@ #pragma implementation // gcc: Class implementation #endif -#if _MSC_VER>=1400 +#if defined(_MSC_VER) && _MSC_VER>=1400 #define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif @@ -65,7 +65,7 @@ #define MSG_WAITALL 0 #endif -#if _MSC_VER>=1400 +#if defined(_MSC_VER) && _MSC_VER>=1400 #pragma warning(push,4) #endif diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc index 77f76876819..ab2764407d8 100644 --- a/storage/sphinx/snippets_udf.cc +++ b/storage/sphinx/snippets_udf.cc @@ -45,7 +45,7 @@ typedef uchar byte; /// partially copy-pasted stuff that should be moved elsewhere -#if UNALIGNED_RAM_ACCESS +#ifdef UNALIGNED_RAM_ACCESS /// pass-through wrapper template < typename T > inline T sphUnalignedRead ( const T & tRef ) @@ -83,7 +83,7 @@ void sphUnalignedWrite ( void * pPtr, const T & tVal ) *pDst++ = *pSrc++; } -#endif +#endif /* UNALIGNED_RAM_ACCESS */ #define SPHINXSE_MAX_ALLOC (16*1024*1024) |