summaryrefslogtreecommitdiff
path: root/config.h.cmake
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-02-22 15:22:22 +0100
committerSergei Golubchik <serg@mariadb.org>2017-02-27 12:35:10 +0100
commit831b531895d9a4c0735eaff727acbc28f4e4b412 (patch)
tree319c726b14f15d91561660e5edb41bc1103b495f /config.h.cmake
parent44534487d4b1364e34a072a67130fe1848636c99 (diff)
downloadmariadb-git-831b531895d9a4c0735eaff727acbc28f4e4b412.tar.gz
MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Debug
It's too plainful to require <my_config.h> to be included first for third-party storage engines. And anyway, some source files might not include <my_config.h> at all, so there is no guarantee that all parts of the binary will see identical definitions of system structures (e.g. struct stat). Define _FILE_OFFSET_BITS on the compiler's command line instead.
Diffstat (limited to 'config.h.cmake')
-rw-r--r--config.h.cmake18
1 files changed, 0 insertions, 18 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 225d4891bf8..dfdd4215e4a 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -484,7 +484,6 @@
#cmakedefine _LARGE_FILES 1
#cmakedefine _LARGEFILE_SOURCE 1
#cmakedefine _LARGEFILE64_SOURCE 1
-#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
#cmakedefine TIME_WITH_SYS_TIME 1
@@ -647,21 +646,4 @@
#cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@
#cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@
-/*
- stat structure (from <sys/stat.h>) is conditionally defined
- to have different layout and size depending on the defined macros.
- The correct macro is defined in my_config.h, which means it MUST be
- included first (or at least before <features.h> - so, practically,
- before including any system headers).
-
- Check the include order by looking at __GLIBC__ (defined in <features.h>)
-
- But we cannot force all third-party clients/connectors to include
- my_config.h first. So, their crashes are their responsibility,
- we enable this check only for MariaDB sources (SAFE_MUTEX check).
-*/
-#if defined(__GLIBC__) && defined(SAFE_MUTEX)
-#error <my_config.h> MUST be included first!
-#endif
-
#endif