From 325e3b6b98ee4ca217b153157936b77dc570bb57 Mon Sep 17 00:00:00 2001
From: Aurelien Foret <aurelien@archlinux.org>
Date: Sun, 5 Feb 2006 09:27:26 +0000
Subject: added a pmconflict_t structure to handle file conflicts

---
 lib/libalpm/alpm.h | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'lib/libalpm/alpm.h')

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index fb764446..47318ada 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -49,6 +49,7 @@ typedef struct __pmgrp_t PM_GRP;
 typedef struct __pmsyncpkg_t PM_SYNCPKG;
 typedef struct __pmtrans_t PM_TRANS;
 typedef struct __pmdepmissing_t PM_DEPMISS;
+typedef struct __pmconflict_t PM_CONFLICT;
 
 /*
  * Library
@@ -268,7 +269,7 @@ int alpm_trans_commit(PM_LIST **data);
 int alpm_trans_release(void);
 
 /*
- * Dependencies
+ * Dependencies and conflicts
  */
 
 enum {
@@ -293,6 +294,24 @@ enum {
 
 void *alpm_dep_getinfo(PM_DEPMISS *miss, unsigned char parm);
 
+/*
+ * File conflicts
+ */
+
+enum {
+	PM_CONFLICT_TYPE_TARGET = 1,
+	PM_CONFLICT_TYPE_FILE
+};
+/* Info parameters */
+enum {
+	PM_CONFLICT_TARGET = 1,
+	PM_CONFLICT_TYPE,
+	PM_CONFLICT_FILE,
+	PM_CONFLICT_CTARGET
+};
+
+void *alpm_conflict_getinfo(PM_CONFLICT *conflict, unsigned char parm);
+
 /*
  * Helpers
  */
-- 
cgit v1.2.3-2-g168b