index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Allan McRae <allan@archlinux.org> | 2011-06-28 13:58:59 +1000 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2011-06-28 13:58:59 +1000 |
commit | 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 (patch) | |
tree | 050849ab5e6246518e3c8e3148e951f2c9b8c440 /lib/libalpm/conflict.c | |
parent | 0a80cf31cfe960b2c62e734aef6e3c662469e917 (diff) |
-rw-r--r-- | lib/libalpm/conflict.c | 2 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 94d82dd9..dd3fdf76 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -281,7 +281,7 @@ static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB, * a wrapper for former functionality that was done inline. */ static alpm_list_t *add_fileconflict(pmhandle_t *handle, - alpm_list_t *conflicts, pmfileconflicttype_t type, const char *filestr, + alpm_list_t *conflicts, alpm_fileconflicttype_t type, const char *filestr, const char *name1, const char *name2) { pmfileconflict_t *conflict; |