From 6bae9a94b97f808e888de1b4633ccb52e7c26c58 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Sat, 22 Aug 2015 16:26:51 +0200
Subject: sfeed_opml_import: does not need util but may need compat.h for
 strlcpy, strlcat

---
 compat.h            | 2 ++
 sfeed_opml_import.c | 1 +
 util.h              | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compat.h b/compat.h
index b154085..0947de6 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,6 @@
+#ifdef COMPAT
 #undef strlcat
 size_t strlcat(char *, const char *, size_t);
 #undef strlcpy
 size_t strlcpy(char *, const char *, size_t);
+#endif
diff --git a/sfeed_opml_import.c b/sfeed_opml_import.c
index 6e253a9..a2e2082 100644
--- a/sfeed_opml_import.c
+++ b/sfeed_opml_import.c
@@ -6,6 +6,7 @@
 #include <strings.h>
 #include <time.h>
 
+#include "compat.h"
 #include "xml.h"
 
 static XMLParser parser; /* XML parser state */
diff --git a/util.h b/util.h
index d0bffa9..efcfc21 100644
--- a/util.h
+++ b/util.h
@@ -1,6 +1,4 @@
-#ifdef COMPAT
 #include "compat.h"
-#endif
 
 #define ISUTF8(c) (((c) & 0xc0) != 0x80)
 #define LEN(x) (sizeof (x) / sizeof *(x))
-- 
cgit v1.2.3