diff options
| author | Allan McRae <allan@archlinux.org> | 2011-06-28 14:35:17 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-06-28 23:28:23 +1000 |
| commit | 37b6cceed41bc22d0d9fb1fe2f274067ddd2b2cc (patch) | |
| tree | 0999ea05b87a25ddba8b4905cfeaa4bebd42533a /src | |
| parent | 220842b37ba484a452f5e4d8071d91d3f2b6c2d4 (diff) | |
| download | pacman-37b6cceed41bc22d0d9fb1fe2f274067ddd2b2cc.tar.xz | |
Rename pmfileconflict_t to alpm_fileconflict_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/sync.c | 2 | ||||
| -rw-r--r-- | src/pacman/upgrade.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f0d7dba8..418cda1d 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -836,7 +836,7 @@ static int sync_trans(alpm_list_t *targets) switch(err) { case PM_ERR_FILE_CONFLICTS: for(i = data; i; i = alpm_list_next(i)) { - pmfileconflict_t *conflict = alpm_list_getdata(i); + alpm_fileconflict_t *conflict = alpm_list_getdata(i); switch(conflict->type) { case PM_FILECONFLICT_TARGET: printf(_("%s exists in both '%s' and '%s'\n"), diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 1fa538da..7f6e0986 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -168,7 +168,7 @@ int pacman_upgrade(alpm_list_t *targets) switch(err) { case PM_ERR_FILE_CONFLICTS: for(i = data; i; i = alpm_list_next(i)) { - pmfileconflict_t *conflict = alpm_list_getdata(i); + alpm_fileconflict_t *conflict = alpm_list_getdata(i); switch(conflict->type) { case PM_FILECONFLICT_TARGET: printf(_("%s exists in both '%s' and '%s'\n"), |