index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Allan McRae <allan@archlinux.org> | 2011-06-28 14:04:00 +1000 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2011-06-28 14:04:00 +1000 |
commit | 64c1cf792184661a1d3dd73329f129172e688f17 (patch) | |
tree | e888776aa3cfadb6854fc1b4b3703f46a9ef27d8 /lib/libalpm/conflict.h | |
parent | 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 (diff) |
-rw-r--r-- | lib/libalpm/conflict.h | 4 |
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 546a2820..d226ba23 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -26,9 +26,9 @@ pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict); void _alpm_conflict_free(pmconflict_t *conflict); -alpm_list_t *_alpm_innerconflicts(pmhandle_t *handle, alpm_list_t *packages); +alpm_list_t *_alpm_innerconflicts(alpm_handle_t *handle, alpm_list_t *packages); alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages); -alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, +alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *upgrade, alpm_list_t *remove); void _alpm_fileconflict_free(pmfileconflict_t *conflict); |