summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-14 10:04:07 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-14 10:04:07 +0200
commitf57ecb7786177e0af3b1e3ec94302720b2e0f967 (patch)
treefcbed357c5bcdb373830413086d4f58ff9ba2998 /include/my_global.h
parent9bfbe7fbce86eab5a8a5de7e401772f058872716 (diff)
parentd364e64ae28c5588ea0ad013738a8dfe18412292 (diff)
downloadmariadb-git-f57ecb7786177e0af3b1e3ec94302720b2e0f967.tar.gz
5.5 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 859c06c6818..30e8909ed13 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -393,7 +393,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