diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-20 00:07:10 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-20 00:07:10 -0500 |
| commit | 0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e (patch) | |
| tree | 0596e17d100cb1de355cfd89556ff118d95598a2 /lib/libalpm/conflict.h | |
| parent | eb2d607899117757971186845930242c4541bfb4 (diff) | |
| parent | 25b7df4dab61e908a0f86e3aad51f1f5c9ed2ccb (diff) | |
Merge branch 'public-structs'
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 7a3784a2..546a2820 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -24,19 +24,6 @@ #include "db.h" #include "package.h" -struct __pmconflict_t { - char *package1; - char *package2; - char *reason; -}; - -struct __pmfileconflict_t { - char *target; - pmfileconflicttype_t type; - char *file; - char *ctarget; -}; - 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); |