Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3832bda1
Commit
3832bda1
authored
May 07, 2015
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiler error if compiler does not support c99 style
initializers.
parent
7ed673f3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
4 deletions
+15
-4
mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
+1
-0
storage/innobase/CMakeLists.txt
storage/innobase/CMakeLists.txt
+2
-0
storage/innobase/handler/i_s.h
storage/innobase/handler/i_s.h
+5
-2
storage/xtradb/CMakeLists.txt
storage/xtradb/CMakeLists.txt
+2
-0
storage/xtradb/handler/i_s.h
storage/xtradb/handler/i_s.h
+5
-2
No files found.
mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
View file @
3832bda1
--
source
include
/
not_embedded
.
inc
select
*
from
information_schema
.
innodb_trx
;
select
*
from
information_schema
.
innodb_trx
;
select
*
from
information_schema
.
innodb_locks
;
select
*
from
information_schema
.
innodb_locks
;
...
...
storage/innobase/CMakeLists.txt
View file @
3832bda1
...
@@ -210,6 +210,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
...
@@ -210,6 +210,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
ADD_DEFINITIONS
(
-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1
)
ADD_DEFINITIONS
(
-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1
)
ENDIF
()
ENDIF
()
CHECK_C_SOURCE_COMPILES
(
"struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }"
HAVE_C99_INITIALIZERS
)
ENDIF
(
NOT MSVC
)
ENDIF
(
NOT MSVC
)
CHECK_FUNCTION_EXISTS
(
asprintf HAVE_ASPRINTF
)
CHECK_FUNCTION_EXISTS
(
asprintf HAVE_ASPRINTF
)
...
...
storage/innobase/handler/i_s.h
View file @
3832bda1
...
@@ -85,10 +85,13 @@ do { \
...
@@ -85,10 +85,13 @@ do { \
} \
} \
} while (0)
} while (0)
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 &&
\
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 &&
!defined __INTEL_COMPILER && !defined __clang__
!defined __INTEL_COMPILER && !defined __clang__
#ifdef HAVE_C99_INITIALIZERS
#define STRUCT_FLD(name, value) .name = value
#define STRUCT_FLD(name, value) .name = value
#else
#else
#define STRUCT_FLD(name, value) name: value
#endif
/* HAVE_C99_INITIALIZERS */
#else
#define STRUCT_FLD(name, value) value
#define STRUCT_FLD(name, value) value
#endif
#endif
...
...
storage/xtradb/CMakeLists.txt
View file @
3832bda1
...
@@ -219,6 +219,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
...
@@ -219,6 +219,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
ADD_DEFINITIONS
(
-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1
)
ADD_DEFINITIONS
(
-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1
)
ENDIF
()
ENDIF
()
CHECK_C_SOURCE_COMPILES
(
"struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }"
HAVE_C99_INITIALIZERS
)
ENDIF
(
NOT MSVC
)
ENDIF
(
NOT MSVC
)
CHECK_FUNCTION_EXISTS
(
asprintf HAVE_ASPRINTF
)
CHECK_FUNCTION_EXISTS
(
asprintf HAVE_ASPRINTF
)
...
...
storage/xtradb/handler/i_s.h
View file @
3832bda1
...
@@ -89,10 +89,13 @@ do { \
...
@@ -89,10 +89,13 @@ do { \
} \
} \
} while (0)
} while (0)
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 &&
\
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 &&
!defined __INTEL_COMPILER && !defined __clang__
!defined __INTEL_COMPILER && !defined __clang__
#ifdef HAVE_C99_INITIALIZERS
#define STRUCT_FLD(name, value) .name = value
#define STRUCT_FLD(name, value) .name = value
#else
#else
#define STRUCT_FLD(name, value) name: value
#endif
/* HAVE_C99_INITIALIZERS */
#else
#define STRUCT_FLD(name, value) value
#define STRUCT_FLD(name, value) value
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment