1 files changed, 1 insertions, 31 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index c5f62f6cf57..7ff8eb56068 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -206,36 +206,6 @@ management to ensure correct alignment for doubles etc. */
 			========================
 */
 
-#ifdef HAVE_LZO
-#define IF_LZO(A,B) A
-#else
-#define IF_LZO(A,B) B
-#endif
-
-#ifdef HAVE_LZ4
-#define IF_LZ4(A,B) A
-#else
-#define IF_LZ4(A,B) B
-#endif
-
-#ifdef HAVE_LZMA
-#define IF_LZMA(A,B) A
-#else
-#define IF_LZMA(A,B) B
-#endif
-
-#ifdef HAVE_BZIP2
-#define IF_BZIP2(A,B) A
-#else
-#define IF_BZIP2(A,B) B
-#endif
-
-#ifdef HAVE_SNAPPY
-#define IF_SNAPPY(A,B) A
-#else
-#define IF_SNAPPY(A,B) B
-#endif
-
 #if defined (HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE) || defined(_WIN32)
 #define IF_PUNCH_HOLE(A,B) A
 #else
@@ -505,7 +475,7 @@ it is read or written. */
 #include "ut0lst.h"
 #include "ut0ut.h"
 
-extern ulong	srv_page_size_shift;
+extern uint32_t srv_page_size_shift;
 extern ulong	srv_page_size;
 
 /* Dimension of spatial object we support so far. It has its root in