diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-06-14 10:52:23 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-06-14 10:52:23 +0200 |
| commit | c94ccb237e5f8b0f72c742746aa49f8ff8440f98 (patch) | |
| tree | 635f7a3d45ec27024d2f7e63e79da82fdeb47273 /include | |
| parent | d0e586763a728fe7eb501df1effe2a4841a62e11 (diff) | |
| download | mariadb-git-c94ccb237e5f8b0f72c742746aa49f8ff8440f98.tar.gz | |
Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8
Backport to 5.5
(external Bug#69407 Build warnings with mysql)
support-files/build-tags:
Run etags on sql_yacc.yy, ignore other .yy files
unittest/mysys/explain_filename-t.cc:
NO_PLAN seems to fail on some platforms, use the actual number instead.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 85f2078e361..0d43964234b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -391,7 +391,7 @@ 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 |