diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 18:45:53 +0200 |
| commit | fd58bb71e22196c3c5e8d20b92bce6f343f1dea1 (patch) | |
| tree | 88b34c77a20d9e816edce51e9dcff47f6de526c8 /storage/innobase/os/os0proc.cc | |
| parent | 37d6d3b661315617953f1a8c5d53a2cb6558992e (diff) | |
| parent | e669e705a1a7d2bbdd42734cb9fc8349a5f2f118 (diff) | |
| download | mariadb-git-fd58bb71e22196c3c5e8d20b92bce6f343f1dea1.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/os/os0proc.cc')
| -rw-r--r-- | storage/innobase/os/os0proc.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/os/os0proc.cc b/storage/innobase/os/os0proc.cc index 22966690ab0..1a6da03a402 100644 --- a/storage/innobase/os/os0proc.cc +++ b/storage/innobase/os/os0proc.cc @@ -24,12 +24,7 @@ process control primitives Created 9/30/1995 Heikki Tuuri *******************************************************/ -#include "ha_prototypes.h" - -#include "os0proc.h" -#include "srv0srv.h" -#include "ut0mem.h" -#include "ut0byte.h" +#include "univ.i" /* FreeBSD for example has only MAP_ANON, Linux has MAP_ANONYMOUS and MAP_ANON but MAP_ANON is marked as deprecated */ |