summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-10-15 23:54:43 +0000
committerAaron Griffin <aaron@archlinux.org>2006-10-15 23:54:43 +0000
commitac30eb2c1e452df5c4e4992038b24b26cfcd5ced (patch)
tree7f64aa644a961c55f6f8e58eb16c2d54e661d81c /lib/libalpm/conflict.h
parent04c48b4547e2a0710b0160b43644310f52db25f0 (diff)
downloadpacman-ac30eb2c1e452df5c4e4992038b24b26cfcd5ced.tar.xz
Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>
for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there
Diffstat (limited to 'lib/libalpm/conflict.h')
-rw-r--r--lib/libalpm/conflict.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index 7b8c9643..5c40af27 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -33,7 +33,7 @@ typedef struct __pmconflict_t {
} pmconflict_t;
PMList *_alpm_checkconflicts(pmdb_t *db, PMList *packages);
-PMList *_alpm_db_find_conflicts(pmdb_t *db, PMList *targets, char *root, PMList **skip_list);
+PMList *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, PMList **skip_list);
#endif /* _ALPM_CONFLICT_H */