diff options
Diffstat (limited to 'src/pacman')
| -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"),  | 
