From 343c23ce9c7aab291721d671fe5504e7bdbfd3c2 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Thu, 17 Nov 2022 12:36:20 +0100 Subject: Don't check for O_PATH being defined O_PATH has been in Linux since version 2.6.39, which was a very long time ago. Additionally, this library only works on Linux anyways since the interface to backlight information is Linux-specific. Therefore we have no real reason to bother with handling the case where it's not defined. --- src/Tupfile | 1 + src/lux.h | 6 ------ src/luxinit.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Tupfile b/src/Tupfile index b6f6d4a..8cc54a0 100644 --- a/src/Tupfile +++ b/src/Tupfile @@ -3,6 +3,7 @@ CFLAGS += -Wall -Wextra -Wpedantic -Werror CFLAGS += -march=native -mtune=native CFLAGS += -fomit-frame-pointer -flto -O3 CFLAGS += -pipe +CFLAGS += -D_GNU_SOURCE import CC=cc import AR=ar diff --git a/src/lux.h b/src/lux.h index 2e83f5d..eb19d0d 100644 --- a/src/lux.h +++ b/src/lux.h @@ -21,12 +21,6 @@ #include #define LIBLUX_BACKLIGHT_DIR "/sys/class/backlight" -#ifdef O_PATH - #define LUX_GDIR_FLAGS O_PATH -#else - #define LUX_GDIR_FLAGS (O_RDONLY | O_DIRECTORY) -#endif - #ifdef __cplusplus extern "C" { diff --git a/src/luxinit.c b/src/luxinit.c index 55151b4..b5b2b84 100644 --- a/src/luxinit.c +++ b/src/luxinit.c @@ -64,7 +64,7 @@ getdir(void) if ((dp = readdir(dir)) == NULL || (dp = readdir(dir)) == NULL || (dp = readdir(dir)) == NULL - || (fd = openat(dfd, dp->d_name, LUX_GDIR_FLAGS)) == -1) + || (fd = openat(dfd, dp->d_name, O_PATH)) == -1) fd = -1; close(dfd); -- cgit v1.2.3