From 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 28 Jun 2011 13:58:59 +1000 Subject: Rename pmfileconflicttype_t to alpm_fileconflicttype_t Signed-off-by: Allan McRae --- lib/libalpm/conflict.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libalpm/conflict.c') 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; -- cgit v1.2.3