Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/alpm.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-16 11:33:20 -0500
committerDan McGee <dan@archlinux.org>2011-06-16 11:57:30 -0500
commit19fcc7401666cd892f7b8a5a49854a1b2eb9988b (patch)
treee39eb1b0f03ee527cdf75426e0c0df0824be32f0 /lib/libalpm/alpm.h
parentbdf00d3dbd19c3def6127f3d372d630930a26abb (diff)
Make struct pmconflict_t public
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/alpm.h')
-rw-r--r--lib/libalpm/alpm.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 4c44a361..0fd6f37e 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -92,7 +92,13 @@ typedef struct __pmgrp_t pmgrp_t;
typedef struct __pmtrans_t pmtrans_t;
typedef struct __pmdepend_t pmdepend_t;
typedef struct __pmdepmissing_t pmdepmissing_t;
-typedef struct __pmconflict_t pmconflict_t;
+
+/** Conflict */
+typedef struct _pmconflict_t {
+ char *package1;
+ char *package2;
+ char *reason;
+} pmconflict_t;
/** File conflict */
typedef struct _pmfileconflict_t {
@@ -928,10 +934,6 @@ const char *alpm_miss_get_causingpkg(const pmdepmissing_t *miss);
alpm_list_t *alpm_checkconflicts(pmhandle_t *handle, alpm_list_t *pkglist);
-const char *alpm_conflict_get_package1(pmconflict_t *conflict);
-const char *alpm_conflict_get_package2(pmconflict_t *conflict);
-const char *alpm_conflict_get_reason(pmconflict_t *conflict);
-
/** Returns the type of version constraint.
* @param dep a dependency info structure
* @return the type of version constraint (PM_DEP_MOD_ANY if no version