aboutsummaryrefslogtreecommitdiff
path: root/libpkgconf/fragment.c
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-10-17 08:58:13 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-10-17 08:58:13 +0300
commit298fa0ef5ba39445f960ab056c0d102ae8af91c5 (patch)
tree0b757fd208848aac0917c9308b04bd761a6ad3c7 /libpkgconf/fragment.c
parent05e05a89096c0e78b037567f76b2d1fb1877455d (diff)
Merge with latest original package version (master branch)
Diffstat (limited to 'libpkgconf/fragment.c')
-rw-r--r--libpkgconf/fragment.c10
1 files changed, 0 insertions, 10 deletions
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;
}