compilation failure on Windows

VS doesn't like #ifdefs inside a macro expansion. move them outside

storage/innobase/handler/ha_innodb.cc

@@ -16797,19 +16797,20 @@ static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim,
   "Use trim. Default FALSE.",
   NULL, NULL, FALSE);
 
+#if defined(HAVE_LZO)
+#define default_compression_algorithm  PAGE_LZO_ALGORITHM
+#elif defined(HAVE_LZ4)
+#define default_compression_algorithm PAGE_LZ4_ALGORITHM
+#else
+#define default_compression_algorithm PAGE_ZLIB_ALGORITHM
+#endif
 static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
   PLUGIN_VAR_OPCMDARG,
   "Compression algorithm used on page compression. 1 for zlib, 2 for lz3, 3 for lzo",
   NULL, NULL,
   PAGE_ZLIB_ALGORITHM,
   0,
-#if defined(HAVE_LZO) && defined(HAVE_LZ4)
-  PAGE_ALGORITHM_LAST,
-#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
-  PAGE_LZ4_ALGORITHM,
-#else
-  PAGE_ZLIB_ALGORITHM,
-#endif
+  default_compression_algorithm,
   0);
 
 static MYSQL_SYSVAR_LONG(mtflush_threads, srv_mtflush_threads,

storage/xtradb/handler/ha_innodb.cc

@@ -17954,19 +17954,20 @@ static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim,
   "Use trim. Default FALSE.",
   NULL, NULL, FALSE);
 
+#if defined(HAVE_LZO)
+#define default_compression_algorithm  PAGE_LZO_ALGORITHM
+#elif defined(HAVE_LZ4)
+#define default_compression_algorithm PAGE_LZ4_ALGORITHM
+#else
+#define default_compression_algorithm PAGE_ZLIB_ALGORITHM
+#endif
 static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
   PLUGIN_VAR_OPCMDARG,
   "Compression algorithm used on page compression. 1 for zlib, 2 for lz3, 3 for lzo",
   NULL, NULL,
   PAGE_ZLIB_ALGORITHM,
   0,
-#if defined(HAVE_LZO) && defined(HAVE_LZ4)
-  PAGE_ALGORITHM_LAST,
-#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
-  PAGE_LZ4_ALGORITHM,
-#else
-  PAGE_ZLIB_ALGORITHM,
-#endif
+  default_compression_algorithm,
   0);
 
 static MYSQL_SYSVAR_LONG(mtflush_threads, srv_mtflush_threads,