diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-10 19:17:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-10 19:17:39 +0100 |
| commit | c4598ce30094a084dec7cd4aba157e1a94d488d6 (patch) | |
| tree | 8a0286cbea0bf60402a3e1c18efdacee3f79f097 | |
| parent | 360c49c1b92ac0a7eb4895da376ec8d53f25fc72 (diff) | |
| download | mariadb-git-c4598ce30094a084dec7cd4aba157e1a94d488d6.tar.gz | |
MDEV-6862 "#error <my_config.h>" and third-party libraries
only enforce the include order if SAFE_MUTEX is defined
(that is, in MariaDB source builds in debug mode)
| -rw-r--r-- | config.h.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config.h.cmake b/config.h.cmake index 4b0769d5cfa..34f77dba050 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -648,9 +648,13 @@ included first (or at least before <features.h> - so, practically, before including any system headers). - __GLIBC__ is defined in <features.h> + 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). */ -#ifdef __GLIBC__ +#if defined(__GLIBC__) && defined(SAFE_MUTEX) #error <my_config.h> MUST be included first! #endif |