summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-03 13:18:36 -0500
committerDan McGee <dan@archlinux.org>2011-06-03 13:18:36 -0500
commite68f5d9a30671419c853b255b32b2e9d0239c9f1 (patch)
treeda3ddef7fa075fcea4035f075d01920fe8b9a3ed /lib/libalpm/conflict.h
parentd2f05f72f02e15164f2d83347317f15c7e8c4fb9 (diff)
downloadpacman-e68f5d9a30671419c853b255b32b2e9d0239c9f1.tar.xz
Remove global handle dependencies from sync/upgrade paths
This kills a lot more global handle business off. sync.c still requires the handle declaration for one reference that can't be changed yet; it will be removed in a future patch which isolates all of the necesary API changes. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.h')
-rw-r--r--lib/libalpm/conflict.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index 418d3f61..d00314de 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -42,8 +42,8 @@ pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
void _alpm_conflict_free(pmconflict_t *conflict);
alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages);
alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages);
-alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
- alpm_list_t *upgrade, alpm_list_t *remove);
+alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle,
+ alpm_list_t *upgrade, alpm_list_t *remove);
void _alpm_fileconflict_free(pmfileconflict_t *conflict);