Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
source windows: backport disabling WIN32_LEAN_AND_MEAN patch
It causes build error on MariaDB bundled build on Windows.
- Loading branch information
Showing
2 changed files
with
17 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff -ru mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h | ||
| --- mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h 2015-08-13 18:15:38.000000000 +0900 | ||
| +++ mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h 2015-08-31 17:13:59.251028024 +0900 | ||
| @@ -47,6 +47,10 @@ | ||
| # undef NTDDI_VERSION | ||
| # endif /* NTDDI_VERSION */ | ||
| # define NTDDI_VERSION GRN_MINIMUM_WINDOWS_VERSION | ||
| + | ||
| +# ifdef WIN32_LEAN_AND_MEAN | ||
| +# undef WIN32_LEAN_AND_MEAN | ||
| +# endif /* WIN32_LEAN_AND_MEAN */ | ||
| #endif /* WIN32 */ | ||
|
|
||
| #ifdef __cplusplus |