diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-18 15:22:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-19 20:26:56 +0200 |
| commit | 6dcc378964a1a35c0c95b6963b73224e52cf4cad (patch) | |
| tree | 6214db4bc7c94b4f5149c3640a36c996cba66aff | |
| parent | 7c03edf2fe66855a8ce8f2575c3aaf66af975377 (diff) | |
| download | mariadb-git-6dcc378964a1a35c0c95b6963b73224e52cf4cad.tar.gz | |
MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Debug
fix incorrect merge, 831b531895 was not fully merged into 10.0
| -rw-r--r-- | config.h.cmake | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/config.h.cmake b/config.h.cmake index 8618d9e6d02..ae81349b566 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -663,21 +663,4 @@ #define __STDC_FORMAT_MACROS #endif -/* - 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 |