diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp')
| -rw-r--r-- | storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp b/storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp index fbb5aa08571..41923892a15 100644 --- a/storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp +++ b/storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp @@ -39,7 +39,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. #include "malloc_utils.hpp" -#if !HAVE_BITS_FUNCTEXCEPT_H +#if !defined(HAVE_BITS_FUNCTEXCEPT_H) namespace std { |