diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-28 00:50:42 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-28 00:50:42 +0000 |
| commit | e637ed739fb25b980eefa424a4e683a7fe6d0179 (patch) | |
| tree | a54660e2331e8f70743a38586e73ef10ca327e60 | |
| parent | 82f8fc3bee0a2175f5de38acb0e4465969da62b8 (diff) | |
| parent | 2a610267eb1a41e0074f1842918872419d9de1e0 (diff) | |
| download | gtk+-e637ed739fb25b980eefa424a4e683a7fe6d0179.tar.gz | |
Merge branch 'memfd_create' into 'master'
gdk/wayland/cursor/os-compatibility: fix build when memfd_create is not available
See merge request GNOME/gtk!3480
| -rw-r--r-- | gdk/wayland/cursor/os-compatibility.c | 1 | ||||
| -rw-r--r-- | meson.build | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gdk/wayland/cursor/os-compatibility.c b/gdk/wayland/cursor/os-compatibility.c index c59733964f..3818a6170e 100644 --- a/gdk/wayland/cursor/os-compatibility.c +++ b/gdk/wayland/cursor/os-compatibility.c @@ -32,7 +32,6 @@ #include <string.h> #include <stdlib.h> -#define HAVE_MEMFD_CREATE #ifdef HAVE_MEMFD_CREATE #include <sys/mman.h> #endif diff --git a/meson.build b/meson.build index 35803e6161..beba87461e 100644 --- a/meson.build +++ b/meson.build @@ -193,6 +193,7 @@ check_functions = [ 'getpagesize', 'getresuid', 'lstat', + 'memfd_create', 'mmap', 'posix_fallocate', '_lock_file', |