From 298fa0ef5ba39445f960ab056c0d102ae8af91c5 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 17 Oct 2017 08:58:13 +0300 Subject: Merge with latest original package version (master branch) --- libpkgconf/fragment.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'libpkgconf/fragment.c') diff --git a/libpkgconf/fragment.c b/libpkgconf/fragment.c index 7646f31..7576db7 100644 --- a/libpkgconf/fragment.c +++ b/libpkgconf/fragment.c @@ -71,22 +71,12 @@ pkgconf_fragment_is_unmergeable(const char *string) static inline bool pkgconf_fragment_should_munge(const char *string, const char *sysroot_dir) { - static const struct pkgconf_fragment_check check_fragments[] = { - {"-isystem", 8}, - {"-idirafter", 10}, - {"-include", 8}, - }; - if (*string != '/') return false; if (sysroot_dir != NULL && strncmp(sysroot_dir, string, strlen(sysroot_dir))) return true; - for (size_t i = 0; i < PKGCONF_ARRAY_SIZE(check_fragments); i++) - if (!strncmp(string, check_fragments[i].token, check_fragments[i].len)) - return true; - return false; } -- cgit v1.1