summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-11 19:35:39 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-11 19:35:39 +0200
commitea4a417a8d456e8e09b6b4306f22c7c20b3e594c (patch)
tree01f9700b021029f4d6b878a3a0feab7ab8b8a458 /include/my_global.h
parent5d9e50fc950502698d3beb95577bc5fe441b38b7 (diff)
parent61ed0ebe7388d8302f2de7144de41da32bf085ba (diff)
downloadmariadb-git-ea4a417a8d456e8e09b6b4306f22c7c20b3e594c.tar.gz
5.2 merge
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index da6c918ff4d..41ab8bc518d 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -498,7 +498,8 @@ C_MODE_END
#define compile_time_assert(X) \
do \
{ \
- typedef char compile_time_assert[(X) ? 1 : -1]; \
+ typedef char compile_time_assert[(X) ? 1 : -1] \
+ __attribute__((unused)); \
} while(0)
#endif