diff options
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 71ed579d..1c673728 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -41,7 +41,8 @@ void _alpm_conflict_free(pmconflict_t *conflict); int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack); 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, char *root); +alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, + alpm_list_t *upgrade, alpm_list_t *remove); void _alpm_fileconflict_free(pmfileconflict_t *conflict); |