summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorDaniel Black <daniel.black@au.ibm.com>2017-02-20 11:36:33 +1100
committerSergey Vojtovich <svoj@mariadb.org>2017-03-03 13:00:41 +0400
commitbc28b305e538774eae4152b300cd323e9a724393 (patch)
tree7cb2fade4ed658dd514ad10daa798cbaecd7341a /storage
parent88b5eedef2b1f235346adf9aeca05c4ebab9921c (diff)
downloadmariadb-git-bc28b305e538774eae4152b300cd323e9a724393.tar.gz
Remove warning: unused variable 'volatile_var' [-Wunused-variable]
This occured in gcc-6.2.1. The variable wasn't used so was no need to be volatile either. Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/include/ut0ut.h4
-rw-r--r--storage/xtradb/include/ut0ut.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index 6786ad166e8..cdf517ce176 100644
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -90,9 +90,7 @@ private:
# define UT_RELAX_CPU() YieldProcessor()
# elif defined(__powerpc__)
#include <sys/platform/ppc.h>
-# define UT_RELAX_CPU() do { \
- volatile lint volatile_var = __ppc_get_timebase(); \
- } while (0)
+# define UT_RELAX_CPU() __ppc_get_timebase()
# else
# define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
# endif
diff --git a/storage/xtradb/include/ut0ut.h b/storage/xtradb/include/ut0ut.h
index 2df6bf58e6a..5fba1c7f547 100644
--- a/storage/xtradb/include/ut0ut.h
+++ b/storage/xtradb/include/ut0ut.h
@@ -87,9 +87,7 @@ private:
# define UT_RELAX_CPU() YieldProcessor()
# elif defined(__powerpc__)
#include <sys/platform/ppc.h>
-# define UT_RELAX_CPU() do { \
- volatile lint volatile_var = __ppc_get_timebase(); \
- } while (0)
+# define UT_RELAX_CPU() __ppc_get_timebase()
# else
# define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
# endif