diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
| commit | a736a3174a4e7c0d92a38901ae61f563d4afede7 (patch) | |
| tree | 348d15f7c9cc883e86d852fbddc780f506669ee4 /mysys | |
| parent | b44e12fef176bfc0884fb2c5f4ba7f42bf054f44 (diff) | |
| parent | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (diff) | |
| download | mariadb-git-a736a3174a4e7c0d92a38901ae61f563d4afede7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_context.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysys/my_context.c b/mysys/my_context.c index 5423f59d19b..4153927d335 100644 --- a/mysys/my_context.c +++ b/mysys/my_context.c @@ -29,6 +29,10 @@ #endif #ifdef MY_CONTEXT_USE_UCONTEXT +#ifdef __APPLE__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif /* The makecontext() only allows to pass integers into the created context :-( We want to pass pointers, so we do it this kinda hackish way. @@ -154,6 +158,9 @@ my_context_destroy(struct my_context *c) DBUG_FREE_CODE_STATE(&c->dbug_state); } +#ifdef __APPLE__ +#pragma GCC diagnostic pop +#endif #endif /* MY_CONTEXT_USE_UCONTEXT */ |