Index: ext/intl/msgformat/msgformat_helpers.cpp
--- ext/intl/msgformat/msgformat_helpers.cpp.orig	2015-09-30 01:35:05.000000000 +0200
+++ ext/intl/msgformat/msgformat_helpers.cpp	2015-10-16 19:33:42.856986147 +0200
@@ -62,11 +62,13 @@
 #endif
 };
 
+#if 0
 const Formattable::Type*
 MessageFormatAdapter::getArgTypeList(const MessageFormat& m,
                                      int32_t& count) {
     return m.getArgTypeList(count);
 }
+#endif
 
 #ifdef HAS_MESSAGE_PATTERN
 const MessagePattern
Index: ext/pdo_mysql/mysql_driver.c
--- ext/pdo_mysql/mysql_driver.c.orig	2015-09-30 01:35:05.000000000 +0200
+++ ext/pdo_mysql/mysql_driver.c	2015-10-16 19:28:25.525702213 +0200
@@ -716,7 +716,7 @@
 			}
 		}
 
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
 		{
 			char *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL TSRMLS_CC);
 			if (public_key) {
Index: ext/pdo_mysql/pdo_mysql.c
--- ext/pdo_mysql/pdo_mysql.c.orig	2015-09-30 01:35:05.000000000 +0200
+++ ext/pdo_mysql/pdo_mysql.c	2015-10-16 19:28:25.525702213 +0200
@@ -123,7 +123,7 @@
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (long)PDO_MYSQL_ATTR_SSL_CA);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (long)PDO_MYSQL_ATTR_SSL_CIPHER);
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
 #endif
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
Index: ext/pdo_mysql/php_pdo_mysql_int.h
--- ext/pdo_mysql/php_pdo_mysql_int.h.orig	2015-09-30 01:35:05.000000000 +0200
+++ ext/pdo_mysql/php_pdo_mysql_int.h	2015-10-16 19:28:25.525702213 +0200
@@ -171,7 +171,7 @@
 	PDO_MYSQL_ATTR_SSL_CA,
 	PDO_MYSQL_ATTR_SSL_CAPATH,
 	PDO_MYSQL_ATTR_SSL_CIPHER,
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
 	PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY,
 #endif
 	PDO_MYSQL_ATTR_MULTI_STATEMENTS,