From 8e09fb67525a91532c0a166c15db02c438a87033 Mon Sep 17 00:00:00 2001 From: tab Date: Sat, 23 Jan 2021 18:49:34 -0500 Subject: [PATCH] hfsfuse: Use unprefixed FUSE header for compatibility More systems support this out of the box, and those that don't can be handled by adding to the include path, while the inverse is not true. This is also the expected header when using pkg-config to discover FUSE, though we don't do this currently, and not all systems that break from this convention ship with a fuse.pc. --- Makefile | 2 +- src/hfsfuse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 833d347..e028f19 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ ifeq ($(OS), Darwin) else ifeq ($(OS), Haiku) CFLAGS += -D_BSD_SOURCE APP_LIB += -lbsd - FUSE_FLAGS += -I/system/develop/headers/userlandfs -I/system/develop/headers/bsd + FUSE_FLAGS += -I/system/develop/headers/userlandfs/fuse -I/system/develop/headers/bsd FUSE_LIB = -L/system/lib/ -luserlandfs_fuse PREFIX ?= /boot/home/config/non-packaged else ifeq ($(OS), FreeBSD) diff --git a/src/hfsfuse.c b/src/hfsfuse.c index e328556..4fb5069 100644 --- a/src/hfsfuse.c +++ b/src/hfsfuse.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #ifndef HFSFUSE_VERSION_STRING #include "version.h"