From 97e5ca02f111c1148396f173be4bd39aa8c677e0 Mon Sep 17 00:00:00 2001 From: Sjors Holtrop <39123298+sholtrop@users.noreply.github.com> Date: Mon, 29 Jan 2024 16:07:27 +0100 Subject: [PATCH] Revert "Added support for compilation on glibc 2.33 and onwards" --- ldp_fuse/include/ldpfuse.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/ldp_fuse/include/ldpfuse.h b/ldp_fuse/include/ldpfuse.h index 089fc59..9abe932 100644 --- a/ldp_fuse/include/ldpfuse.h +++ b/ldp_fuse/include/ldpfuse.h @@ -29,19 +29,7 @@ #include #include #include - -/* - from version GLIBC 2.32 unistd.h contains constant definitions that we need, but also `close_range` - This causes conflicts as symbols with those names are also - necessarily defined here. We therefore overwrite them using #define. -*/ -#if (__GLIBC__ > 1 && __GLIBC_MINOR__ > 32) -#define close_range __renamed_close_range -#include -#undef close_range -#else #include -#endif // Include `cwalk` directly as this lib is header-only #include "./cwalk.c" @@ -430,15 +418,7 @@ static char* resolve_fd(int fd) { #define LDP_FUSE_PATH_MAX_LEN 256 -/* - from version 2.32 glibc does not have the _STAT_VER macro - defined in "sys/stat.h" -*/ -#if (__GLIBC__ > 1 && __GLIBC_MINOR__ > 32) -#define STAT_VER 0 -#else #define STAT_VER _STAT_VER -#endif // Whether `path` is in the LDP_FUSE filesystem. The LDP_FUSE filesystem is // mounted under the LDP_FUSE_PATH env variable.