Make struct pmconflict_t public

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 7 insertions, 29 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
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index d9a0b7ca..39f42bfe 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -547,22 +547,4 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle,
 	return conflicts;
 }
 
-const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict)
-{
-	ASSERT(conflict != NULL, return NULL);
-	return conflict->package1;
-}
-
-const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict)
-{
-	ASSERT(conflict != NULL, return NULL);
-	return conflict->package2;
-}
-
-const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict)
-{
-	ASSERT(conflict != NULL, return NULL);
-	return conflict->reason;
-}
-
 /* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index a9d3e27b..546a2820 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -24,12 +24,6 @@
 #include "db.h"
 #include "package.h"
 
-struct __pmconflict_t {
-	char *package1;
-	char *package2;
-	char *reason;
-};
-
 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);