diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:20:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:46:51 +0300 |
commit | 70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd (patch) | |
tree | 14d0c4dba49e36dc0d80c1ba99757b4074781d2d /include/my_sys.h | |
parent | 7edadde72eb23e9110db8cea810c023104e9d15e (diff) | |
parent | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (diff) | |
download | mariadb-git-70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'include/my_sys.h')
-rw-r--r-- | include/my_sys.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index dfabda42022..ed5a7200ec8 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -949,6 +949,12 @@ extern ulonglong my_getcputime(void); #define hrtime_sec_part(X) ((ulong)((X).val % HRTIME_RESOLUTION)) #define my_time(X) hrtime_to_time(my_hrtime()) +#if STACK_DIRECTION < 0 +#define available_stack_size(CUR,END) (long) ((char*)(CUR) - (char*)(END)) +#else +#define available_stack_size(CUR,END) (long) ((char*)(END) - (char*)(CUR)) +#endif + #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> |