Prefix alpm_fileconflicttype_t members with ALPM

Signed-off-by: Allan McRae <allan@archlinux.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index ce57d3cd..03150489 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -838,11 +838,11 @@ static int sync_trans(alpm_list_t *targets)
 				for(i = data; i; i = alpm_list_next(i)) {
 					alpm_fileconflict_t *conflict = alpm_list_getdata(i);
 					switch(conflict->type) {
-						case PM_FILECONFLICT_TARGET:
+						case ALPM_FILECONFLICT_TARGET:
 							printf(_("%s exists in both '%s' and '%s'\n"),
 									conflict->file, conflict->target, conflict->ctarget);
 							break;
-						case PM_FILECONFLICT_FILESYSTEM:
+						case ALPM_FILECONFLICT_FILESYSTEM:
 							printf(_("%s: %s exists in filesystem\n"),
 									conflict->target, conflict->file);
 							break;
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 31536a43..258db609 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -170,11 +170,11 @@ int pacman_upgrade(alpm_list_t *targets)
 				for(i = data; i; i = alpm_list_next(i)) {
 					alpm_fileconflict_t *conflict = alpm_list_getdata(i);
 					switch(conflict->type) {
-						case PM_FILECONFLICT_TARGET:
+						case ALPM_FILECONFLICT_TARGET:
 							printf(_("%s exists in both '%s' and '%s'\n"),
 									conflict->file, conflict->target, conflict->ctarget);
 							break;
-						case PM_FILECONFLICT_FILESYSTEM:
+						case ALPM_FILECONFLICT_FILESYSTEM:
 							printf(_("%s: %s exists in filesystem\n"),
 									conflict->target, conflict->file);
 							break;