Skip to content

Commit 6dcc378

Browse files
committed
MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Debug
fix incorrect merge, 831b531 was not fully merged into 10.0
1 parent 7c03edf commit 6dcc378

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

config.h.cmake

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -663,21 +663,4 @@
663663
#define __STDC_FORMAT_MACROS
664664
#endif
665665

666-
/*
667-
stat structure (from <sys/stat.h>) is conditionally defined
668-
to have different layout and size depending on the defined macros.
669-
The correct macro is defined in my_config.h, which means it MUST be
670-
included first (or at least before <features.h> - so, practically,
671-
before including any system headers).
672-
673-
Check the include order by looking at __GLIBC__ (defined in <features.h>)
674-
675-
But we cannot force all third-party clients/connectors to include
676-
my_config.h first. So, their crashes are their responsibility,
677-
we enable this check only for MariaDB sources (SAFE_MUTEX check).
678-
*/
679-
#if defined(__GLIBC__) && defined(SAFE_MUTEX)
680-
#error <my_config.h> MUST be included first!
681-
#endif
682-
683666
#endif

0 commit comments

Comments
 (0)