database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix compiler error if compiler does not support c99 style

Browse Source 
initializers.
This commit is contained in:
Jan Lindström
2015-05-07 14:00:14 +03:00
parent 7ed673f35c
commit 3832bda1ba
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
View File

@ -1,3 +1,4 @@
--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;

2
storage/innobase/CMakeLists.txt
View File

@ -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)

7
storage/innobase/handler/i_s.h
View File

@ -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

2
storage/xtradb/CMakeLists.txt
View File

@ -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)

7
storage/xtradb/handler/i_s.h
View File

@ -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