commit 18a9c7f892c7460bf71ec8b912cfbe3ac028aecd
from: Stefan Sperling <stsp@stsp.name>
date: Sun Sep 20 21:25:15 2020 UTC

remove another custom linux shim in favour of compat/ directory

commit - 41d00e9f34296294af1563a9e05bb39c6f428a41
commit + 18a9c7f892c7460bf71ec8b912cfbe3ac028aecd
blob - 5e1032c5d328cdc1ec0d1d83acd13bad81a337bf
blob + 598d7b74a05865a500826f9b346fd3933781415f
--- diff/GNUmakefile
+++ diff/GNUmakefile
@@ -4,6 +4,9 @@ CFLAGS += -Wstrict-prototypes -Wunused-variable
 SRCS=	diff.c
 LIB=	../lib/libdiff.a
 
+# Compat sources
+CFLAGS+=       -I$(CURDIR)/../compat/include
+
 diff: $(SRCS) $(LIB)
 	gcc $(CFLAGS) -I../include -o $@ $^
 
blob - 1c42ceb0c7f7c6486d031ba90ed8c5c3acc44345
blob + 283d70c25b80709512d47b567d0348516692f4f0
--- diff/diff.c
+++ diff/diff.c
@@ -18,6 +18,7 @@
 
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include <err.h>
 #include <fcntl.h>
@@ -32,16 +33,6 @@
 #include <diff/diff_main.h>
 #include <diff/diff_output.h>
 
-#ifdef __linux__
-/* stupid shims to compile and test on linux */
-#define __dead
-
-static inline const char *getprogname(void)
-{
-	return "diff";
-}
-#endif
-
 __dead void	 usage(void);
 int		 diffreg(char *, char *, bool, bool, int);
 int		 openfile(const char *, char **, struct stat *);