diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
| commit | e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff (patch) | |
| tree | c6f2f7343bf9ad5dfd40ec83d5485ec3e05d26d2 /mysys/mysys_priv.h | |
| parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
| parent | 49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (diff) | |
| download | mariadb-git-e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff.tar.gz | |
Merge branch '10.0' 10.1
Diffstat (limited to 'mysys/mysys_priv.h')
| -rw-r--r-- | mysys/mysys_priv.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 471862a6d0b..da11b86e768 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -108,9 +108,13 @@ size_t sf_malloc_usable_size(void *ptr, my_bool *is_thread_specific); void my_error_unregister_all(void); -#if !defined(O_PATH) && defined(O_EXEC) /* FreeBSD */ +#ifndef O_PATH /* not Linux */ +#if defined(O_SEARCH) /* Illumos */ +#define O_PATH O_SEARCH +#elif defined(O_EXEC) /* FreeBSD */ #define O_PATH O_EXEC #endif +#endif #ifdef O_PATH #define HAVE_OPEN_PARENT_DIR_NOSYMLINKS |