diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-11-20 09:10:23 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-11-20 09:10:23 +0000 |
| commit | aa1c0ba9f8787fc3b1a1190103e394b0c1c95922 (patch) | |
| tree | ed0c9675f7fc5da043a69b36e0b8c6c8e05cb583 /lib/libalpm/conflict.h | |
| parent | b8b9596b13de957566211b0e1db3e473ed66e147 (diff) | |
| download | pacman-aa1c0ba9f8787fc3b1a1190103e394b0c1c95922.tar.xz | |
* repo-add script - to add entries to a db file directly from package data (no PKGBUILD)
* libalpm api changes - move from a _getinfo(p, WHAT_WE_WANT) scheme to a
typesafe _get_what_we_want(p) scheme [not 100% complete yet]
* some const correctness changes
* removal of PM_* types in alpm.h in favor of the pm*_t types used throughout
libalpm
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 5 |
1 files changed, 3 insertions, 2 deletions
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); |