aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-11-06 17:52:53 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-11-06 17:52:53 +0200
commit019768ad8cadfd4bc3305ceea50c33228687d421 (patch)
tree0b3c3cfa19dd3909dd3e7547947b9a4684525bef
parent298fa0ef5ba39445f960ab056c0d102ae8af91c5 (diff)
Rename requires to requires_ since it is keyword in C++20requires
-rw-r--r--libpkgconf/libpkgconf.h2
-rw-r--r--libpkgconf/pkg.c8
-rw-r--r--libpkgconf/queue.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index ac873bf..b07ec68 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -128,7 +128,7 @@ struct pkgconf_pkg_ {
pkgconf_list_t cflags;
pkgconf_list_t cflags_private;
- pkgconf_list_t requires;
+ pkgconf_list_t requires_; /* Keyword in C++20. */
pkgconf_list_t requires_private;
pkgconf_list_t conflicts;
pkgconf_list_t provides;
diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c
index ce3921b..3e3268a 100644
--- a/libpkgconf/pkg.c
+++ b/libpkgconf/pkg.c
@@ -181,7 +181,7 @@ static const pkgconf_pkg_parser_keyword_pair_t pkgconf_pkg_parser_keyword_funcs[
{"LIBS.private", pkgconf_pkg_parser_fragment_func, offsetof(pkgconf_pkg_t, libs_private)},
{"Name", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, realname)},
{"Provides", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, provides)},
- {"Requires", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires)},
+ {"Requires", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_)},
{"Requires.private", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_private)},
{"Version", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, version)},
};
@@ -423,7 +423,7 @@ pkgconf_pkg_free(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
pkgconf_cache_remove(client, pkg);
- pkgconf_dependency_free(&pkg->requires);
+ pkgconf_dependency_free(&pkg->requires_);
pkgconf_dependency_free(&pkg->requires_private);
pkgconf_dependency_free(&pkg->conflicts);
pkgconf_dependency_free(&pkg->provides);
@@ -1408,7 +1408,7 @@ pkgconf_pkg_walk_conflicts_list(pkgconf_client_t *client,
if (*parentnode->package == '\0')
continue;
- PKGCONF_FOREACH_LIST_ENTRY(root->requires.head, childnode)
+ PKGCONF_FOREACH_LIST_ENTRY(root->requires_.head, childnode)
{
pkgconf_pkg_t *pkgdep;
pkgconf_dependency_t *depnode = childnode->data;
@@ -1488,7 +1488,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
}
PKGCONF_TRACE(client, "%s: walking requires list", root->id);
- eflags = pkgconf_pkg_walk_list(client, root, &root->requires, func, data, maxdepth);
+ eflags = pkgconf_pkg_walk_list(client, root, &root->requires_, func, data, maxdepth);
if (eflags != PKGCONF_PKG_ERRF_OK)
return eflags;
diff --git a/libpkgconf/queue.c b/libpkgconf/queue.c
index 73507fa..fb6eefd 100644
--- a/libpkgconf/queue.c
+++ b/libpkgconf/queue.c
@@ -77,10 +77,10 @@ pkgconf_queue_compile(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_li
pkgconf_queue_t *pkgq;
pkgq = iter->data;
- pkgconf_dependency_parse(client, world, &world->requires, pkgq->package);
+ pkgconf_dependency_parse(client, world, &world->requires_, pkgq->package);
}
- return (world->requires.head != NULL);
+ return (world->requires_.head != NULL);
}
/*