projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util/rand_xor: fallback Linux to time-based instead of fixed seed
[mesa.git]
/
src
/
util
/
anon_file.c
diff --git
a/src/util/anon_file.c
b/src/util/anon_file.c
index 90c55cd5af0c8a7347ffbddeaa718ae8a96f4738..bd415adb647787bd36c7a404fa1724f07dca3653 100644
(file)
--- a/
src/util/anon_file.c
+++ b/
src/util/anon_file.c
@@
-27,26
+27,25
@@
* Based on weston shared/os-compatibility.c
*/
* Based on weston shared/os-compatibility.c
*/
-#ifndef WIN32
+#ifndef
_
WIN32
#include "anon_file.h"
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include "anon_file.h"
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
#ifdef __FreeBSD__
#include <sys/mman.h>
#ifdef __FreeBSD__
#include <sys/mman.h>
-#elif defined(HAVE_MEMFD_CREATE)
+#elif defined(HAVE_MEMFD_CREATE)
|| defined(ANDROID)
#include <sys/syscall.h>
#include <linux/memfd.h>
#include <sys/syscall.h>
#include <linux/memfd.h>
+#include <stdlib.h>
#else
#include <stdio.h>
#include <stdlib.h>
#endif
#else
#include <stdio.h>
#include <stdlib.h>
#endif
-#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(HAVE_MKOSTEMP))
+#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(HAVE_MKOSTEMP)
|| defined(ANDROID)
)
static int
set_cloexec_or_close(int fd)
{
static int
set_cloexec_or_close(int fd)
{
@@
-70,7
+69,7
@@
err:
}
#endif
}
#endif
-#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE))
+#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE)
|| defined(ANDROID)
)
static int
create_tmpfile_cloexec(char *tmpname)
{
static int
create_tmpfile_cloexec(char *tmpname)
{
@@
-120,7
+119,7
@@
os_create_anonymous_file(off_t size, const char *debug_name)
#ifdef __FreeBSD__
(void*)debug_name;
fd = shm_open(SHM_ANON, O_CREAT | O_RDWR | O_CLOEXEC, 0600);
#ifdef __FreeBSD__
(void*)debug_name;
fd = shm_open(SHM_ANON, O_CREAT | O_RDWR | O_CLOEXEC, 0600);
-#elif defined(HAVE_MEMFD_CREATE)
+#elif defined(HAVE_MEMFD_CREATE)
|| defined(ANDROID)
if (!debug_name)
debug_name = "mesa-shared";
fd = syscall(SYS_memfd_create, debug_name, MFD_CLOEXEC);
if (!debug_name)
debug_name = "mesa-shared";
fd = syscall(SYS_memfd_create, debug_name, MFD_CLOEXEC);