diff options
| author | Allan McRae <allan@archlinux.org> | 2011-06-28 13:56:46 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-06-28 13:56:46 +1000 |
| commit | 0a80cf31cfe960b2c62e734aef6e3c662469e917 (patch) | |
| tree | 6d8a33b4c375f80c60559c49d9e7f6c0ecca7f04 | |
| parent | 7ce674491bd854610855fe83482eda6b18273fa0 (diff) | |
| download | pacman-0a80cf31cfe960b2c62e734aef6e3c662469e917.tar.xz | |
Rename pmdepmod_t to alpm_depmod_t
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/alpm.h | 6 | ||||
| -rw-r--r-- | lib/libalpm/deps.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 00d21563..25f7f6db 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -61,7 +61,7 @@ typedef enum _alpm_pkgreason_t { } alpm_pkgreason_t; /** Types of version constraints in dependency specs. */ -typedef enum _pmdepmod_t { +typedef enum _alpm_depmod_t { /** No version constraint */ PM_DEP_MOD_ANY = 1, /** Test version equality (package=x.y.z) */ @@ -74,7 +74,7 @@ typedef enum _pmdepmod_t { PM_DEP_MOD_GT, /** Test for less than some version (package<x.y.z) */ PM_DEP_MOD_LT -} pmdepmod_t; +} alpm_depmod_t; /** * File conflict type. @@ -110,7 +110,7 @@ typedef struct _pmdepend_t { char *name; char *version; unsigned long name_hash; - pmdepmod_t mod; + alpm_depmod_t mod; } pmdepend_t; /** Missing dependency */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 085e6ca9..fd118a0b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -348,7 +348,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmhandle_t *handle, alpm_list_t *pkglist, return baddeps; } -static int dep_vercmp(const char *version1, pmdepmod_t mod, +static int dep_vercmp(const char *version1, alpm_depmod_t mod, const char *version2) { int equal = 0; |