diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-12 15:54:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-12 15:54:08 +0200 |
| commit | 254bb1c35bbb10a043482e8f1f7c139a32b836f6 (patch) | |
| tree | 0d5dcbc797c8400bd041945472ec5a351ae60c51 /include | |
| parent | ef639f1a93b87abd759c8fe815d490954fe3e594 (diff) | |
| parent | 97569d3c37a66bc941b933ac7c2cefa5430a5175 (diff) | |
| download | mariadb-git-254bb1c35bbb10a043482e8f1f7c139a32b836f6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_atomic_wrapper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_atomic_wrapper.h b/include/my_atomic_wrapper.h index 64835e30ca7..c0e18ea7c91 100644 --- a/include/my_atomic_wrapper.h +++ b/include/my_atomic_wrapper.h @@ -13,6 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ +#pragma once #ifdef __cplusplus #include <atomic> /** |