Merge pull request #1361 from sghctoma/fix-shm

Force ftruncate for shared memory objects on FreeBSD

3 files changed, 0 insertions, 18 deletions

diff --git a/include/wlr/config.h.in b/include/wlr/config.h.in
index 750ad3b7..17277c07 100644
--- a/include/wlr/config.h.in
+++ b/include/wlr/config.h.in
@@ -14,6 +14,4 @@
 #mesondefine WLR_HAS_XCB_ICCCM
 #mesondefine WLR_HAS_XCB_XKB
 
-#mesondefine WLR_HAS_POSIX_FALLOCATE
-
 #endif
diff --git a/meson.build b/meson.build
index 18a5d908..1ed93c04 100644
--- a/meson.build
+++ b/meson.build
@@ -72,10 +72,6 @@ if logind.found()
 	wlr_deps += logind
 endif
 
-if cc.has_header_symbol('fcntl.h', 'posix_fallocate', prefix: '#define _POSIX_C_SOURCE 200112L')
-	conf_data.set('WLR_HAS_POSIX_FALLOCATE', true)
-endif
-
 subdir('protocol')
 subdir('render')
 
diff --git a/util/shm.c b/util/shm.c
index 3783e473..f7c7303e 100644
--- a/util/shm.c
+++ b/util/shm.c
@@ -42,17 +42,6 @@ int allocate_shm_file(size_t size) {
 		return -1;
 	}
 
-#ifdef WLR_HAS_POSIX_FALLOCATE
-	int ret;
-	do {
-		ret = posix_fallocate(fd, 0, size);
-	} while (ret == EINTR);
-	if (ret != 0) {
-		close(fd);
-		errno = ret;
-		return -1;
-	}
-#else
 	int ret;
 	do {
 		ret = ftruncate(fd, size);
@@ -61,7 +50,6 @@ int allocate_shm_file(size_t size) {
 		close(fd);
 		return -1;
 	}
-#endif
 
 	return fd;
 }