diff --git a/include/my_pthread.h b/include/my_pthread.h
index 2da7850f37c..9e2c2111b8e 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -279,7 +279,7 @@ int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
 #define my_pthread_setprio(A,B) pthread_setprio_np((A),(B))
 #elif defined(HAVE_PTHREAD_SETPRIO)
 #define my_pthread_setprio(A,B) pthread_setprio((A),(B))
-#elif defined(HAVE_PTHREAD_SETSCHEDPRIO) && !defined (__GNUC)
+#elif defined(HAVE_PTHREAD_SETSCHEDPRIO) && !defined (__GNUC__)
 /*
    Workaround for bug on Solaris where pthread.h have bug in GNU
    version of pthread.h => configure says yes, header files says
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index e0b97b759cc..2144f17be35 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -8375,7 +8375,7 @@ static MYSQL_SYSVAR_LONG(force_recovery, innobase_force_recovery,
 static MYSQL_SYSVAR_LONG(lock_wait_timeout, innobase_lock_wait_timeout,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back.",
-  NULL, NULL, (long)50, (long)1, (long)1024 * 1024 * 1024, (long)0);
+  NULL, NULL, (long)50, (long)1, (long)(1024*1024*1024), (long)0);
 
 static MYSQL_SYSVAR_LONG(log_buffer_size, innobase_log_buffer_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,