index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | lib/libalpm/conflict.h | 5 |
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index a47a585e..7bf8744b 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -22,15 +22,16 @@ #define _ALPM_CONFLICT_H #include "db.h" +#include "alpm.h" #define CONFLICT_FILE_LEN 512 -typedef struct __pmconflict_t { +struct __pmconflict_t { char target[PKG_NAME_LEN]; unsigned char type; char file[CONFLICT_FILE_LEN]; char ctarget[PKG_NAME_LEN]; -} pmconflict_t; +}; pmlist_t *_alpm_checkconflicts(pmdb_t *db, pmlist_t *packages); pmlist_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, pmlist_t **skip_list); |