diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-30 10:37:08 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-30 10:37:08 -0500 |
| commit | ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1 (patch) | |
| tree | d79aa34734791bb069eab172b8ea3e0ee12bedc6 /lib/libalpm/conflict.h | |
| parent | 0f4aaeee42135d06dd18eb585eab3bae0e5fbf34 (diff) | |
| parent | fed3e09c94d204b4655656c703a178e6fa2144b3 (diff) | |
| download | pacman-ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1.tar.xz | |
Merge remote-tracking branch 'allan/breakshit'
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 546a2820..6c13cb28 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -24,14 +24,14 @@ #include "db.h" #include "package.h" -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_outerconflicts(pmdb_t *db, alpm_list_t *packages); -alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, +alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict); +void _alpm_conflict_free(alpm_conflict_t *conflict); +alpm_list_t *_alpm_innerconflicts(alpm_handle_t *handle, alpm_list_t *packages); +alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages); +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); +void _alpm_fileconflict_free(alpm_fileconflict_t *conflict); #endif /* _ALPM_CONFLICT_H */ |