Rename pmfileconflicttype_t to alpm_fileconflicttype_t

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

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 25f7f6db..8a7979f2 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -81,10 +81,10 @@ typedef enum _alpm_depmod_t {
  * Whether the conflict results from a file existing on the filesystem, or with
  * another target in the transaction.
  */
-typedef enum _pmfileconflicttype_t {
+typedef enum _alpm_fileconflicttype_t {
 	PM_FILECONFLICT_TARGET = 1,
 	PM_FILECONFLICT_FILESYSTEM
-} pmfileconflicttype_t;
+} alpm_fileconflicttype_t;
 
 /**
  * GPG signature verification options
@@ -131,7 +131,7 @@ typedef struct _pmconflict_t {
 /** File conflict */
 typedef struct _pmfileconflict_t {
 	char *target;
-	pmfileconflicttype_t type;
+	alpm_fileconflicttype_t type;
 	char *file;
 	char *ctarget;
 } pmfileconflict_t;
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;