diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 11:19:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 11:19:25 +0300 |
| commit | c11e5cdd12a6ffbc3c95e0abff6cc86920d592fa (patch) | |
| tree | 1f860a1e1cb620fa9a71c99967bb19d64a8c2a3c /include/my_sys.h | |
| parent | 62dce14d156ff99836a23f5ccadcfaa19cf11f8a (diff) | |
| parent | cf71cc838e608b4a4b8ae2557d4957ecb9bef97a (diff) | |
| download | mariadb-git-c11e5cdd12a6ffbc3c95e0abff6cc86920d592fa.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 35e05597c92..8f0d98f68bb 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -964,8 +964,6 @@ extern ulonglong my_getcputime(void); #endif #ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> - #ifndef MAP_NOSYNC #define MAP_NOSYNC 0 #endif |