summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.h
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-06-28 14:04:00 +1000
committerAllan McRae <allan@archlinux.org>2011-06-28 14:04:00 +1000
commit64c1cf792184661a1d3dd73329f129172e688f17 (patch)
treee888776aa3cfadb6854fc1b4b3703f46a9ef27d8 /lib/libalpm/conflict.h
parent1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 (diff)
downloadpacman-64c1cf792184661a1d3dd73329f129172e688f17.tar.xz
Rename pmhandle_t to alpm_handle_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.h')
-rw-r--r--lib/libalpm/conflict.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index 546a2820..d226ba23 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -26,9 +26,9 @@
pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
void _alpm_conflict_free(pmconflict_t *conflict);
-alpm_list_t *_alpm_innerconflicts(pmhandle_t *handle, alpm_list_t *packages);
+alpm_list_t *_alpm_innerconflicts(alpm_handle_t *handle, alpm_list_t *packages);
alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages);
-alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle,
+alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
alpm_list_t *upgrade, alpm_list_t *remove);
void _alpm_fileconflict_free(pmfileconflict_t *conflict);