Merge lp:~akopytov/percona-server/bug1126077 into lp:percona-server/5.5

Proposed by Alexey Kopytov
Status: Merged
Approved by: Vlad Lesin
Approved revision: 446
Merged at revision: 446
Proposed branch: lp:~akopytov/percona-server/bug1126077
Merge into: lp:percona-server/5.5
Diff against target: 13 lines (+2/-1)
1 file modified
Percona-Server/storage/innobase/handler/i_s.cc (+2/-1)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug1126077
Reviewer Review Type Date Requested Status
Vlad Lesin (community) g2 Approve
Review via email: mp+148672@code.launchpad.net

Description of the change

  Bug #1126077: Remove clang warnings

  Fixed an annoying warning in the InnoDB code produced by clang.

To post a comment you must log in.
446. By Alexey Kopytov

Bug #1126077: Remove clang warnings

Fixed an annoying warning in the InnoDB code produced by clang.

This is a backport from 5.6.

Revision history for this message
Vlad Lesin (vlad-lesin) :
review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/handler/i_s.cc'
2--- Percona-Server/storage/innobase/handler/i_s.cc 2013-01-29 15:14:23 +0000
3+++ Percona-Server/storage/innobase/handler/i_s.cc 2013-02-15 11:27:23 +0000
4@@ -168,7 +168,8 @@
5 } \
6 } while (0)
7
8-#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER
9+#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && \
10+ !defined __INTEL_COMPILER && !defined __clang__
11 #define STRUCT_FLD(name, value) name: value
12 #else
13 #define STRUCT_FLD(name, value) value

Subscribers

People subscribed via source and target branches