diff --git a/meson.build b/meson.build index feedd1063..d8bdb5808 100644 --- a/meson.build +++ b/meson.build @@ -117,7 +117,7 @@ if cc.has_function('mkstemp', prefix : '#include ') cdata.set('HAVE_MKSTEMP', 1) endif -if cc.has_function('memfd_create', prefix : '#include ', args : [ '-D__USE_GNU' ]) +if cc.has_function('memfd_create', prefix : '#include ', args : [ '-D_GNU_SOURCE' ]) cdata.set('HAVE_MEMFD_CREATE', 1) endif diff --git a/src/pipewire/mem.c b/src/pipewire/mem.c index dcd1fe4b0..4e17c3a05 100644 --- a/src/pipewire/mem.c +++ b/src/pipewire/mem.c @@ -21,6 +21,8 @@ #define _GNU_SOURCE #endif +#include "config.h" + #include #include #include @@ -34,6 +36,7 @@ #include #include +#ifndef HAVE_MEMFD_CREATE /* * No glibc wrappers exist for memfd_create(2), so provide our own. * @@ -46,6 +49,7 @@ static inline int memfd_create(const char *name, unsigned int flags) { return syscall(SYS_memfd_create, name, flags); } +#endif /* memfd_create(2) flags */ diff --git a/src/pipewire/memfd-wrappers.h b/src/pipewire/memfd-wrappers.h deleted file mode 100644 index 860e3960c..000000000 --- a/src/pipewire/memfd-wrappers.h +++ /dev/null @@ -1,62 +0,0 @@ -/* PipeWire - * Copyright (C) 2016 Wim Taymans - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include -#include - -#ifndef HAVE_MEMFD_CREATE -/* - * No glibc wrappers exist for memfd_create(2), so provide our own. - * - * Also define memfd fcntl sealing macros. While they are already - * defined in the kernel header file , that file as - * a whole conflicts with the original glibc header . - */ - -static inline int -memfd_create(const char *name, unsigned int flags) { - return syscall(SYS_memfd_create, name, flags); -} -#endif - -/* memfd_create(2) flags */ - -#ifndef MFD_CLOEXEC -#define MFD_CLOEXEC 0x0001U -#endif - -#ifndef MFD_ALLOW_SEALING -#define MFD_ALLOW_SEALING 0x0002U -#endif - -/* fcntl() seals-related flags */ - -#ifndef F_LINUX_SPECIFIC_BASE -#define F_LINUX_SPECIFIC_BASE 1024 -#endif - -#ifndef F_ADD_SEALS -#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) - -#define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ -#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ -#define F_SEAL_GROW 0x0004 /* prevent file from growing */ -#define F_SEAL_WRITE 0x0008 /* prevent writes */ -#endif