summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@skysql.com>2015-05-06 16:47:23 +0300
committerJan Lindström <jan.lindstrom@skysql.com>2015-05-06 16:47:23 +0300
commitf704b3335f3155f38f951d706c0fe2060acb06c3 (patch)
treed33d96384085809e84699cce60a080d204eb881c
parent4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff)
parent4d606cb95520e6fff5835c05f2df4b10233d4ced (diff)
downloadmariadb-git-f704b3335f3155f38f951d706c0fe2060acb06c3.tar.gz
Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-members
c99 style for assigning structure members
-rw-r--r--storage/innobase/handler/i_s.cc2
-rw-r--r--storage/xtradb/handler/i_s.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index 9fec09da564..48c8c46a951 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -158,7 +158,7 @@ do { \
} while (0)
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER
-#define STRUCT_FLD(name, value) name: value
+#define STRUCT_FLD(name, value) .name = value
#else
#define STRUCT_FLD(name, value) value
#endif
diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
index 01e40222c22..6ca38d3e394 100644
--- a/storage/xtradb/handler/i_s.cc
+++ b/storage/xtradb/handler/i_s.cc
@@ -180,7 +180,7 @@ do { \
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && \
!defined __INTEL_COMPILER && !defined __clang__
-#define STRUCT_FLD(name, value) name: value
+#define STRUCT_FLD(name, value) .name = value
#else
#define STRUCT_FLD(name, value) value
#endif