index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Allan McRae <allan@archlinux.org> | 2011-06-28 13:58:59 +1000 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2011-06-28 13:58:59 +1000 |
commit | 1c5c7c907c8cfb26c129d60d919c837ff42ca1c5 (patch) | |
tree | 050849ab5e6246518e3c8e3148e951f2c9b8c440 /lib/libalpm/alpm.h | |
parent | 0a80cf31cfe960b2c62e734aef6e3c662469e917 (diff) |
-rw-r--r-- | lib/libalpm/alpm.h | 6 |
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 25f7f6db..8a7979f2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -81,10 +81,10 @@ typedef enum _alpm_depmod_t { * Whether the conflict results from a file existing on the filesystem, or with * another target in the transaction. */ -typedef enum _pmfileconflicttype_t { +typedef enum _alpm_fileconflicttype_t { PM_FILECONFLICT_TARGET = 1, PM_FILECONFLICT_FILESYSTEM -} pmfileconflicttype_t; +} alpm_fileconflicttype_t; /** * GPG signature verification options @@ -131,7 +131,7 @@ typedef struct _pmconflict_t { /** File conflict */ typedef struct _pmfileconflict_t { char *target; - pmfileconflicttype_t type; + alpm_fileconflicttype_t type; char *file; char *ctarget; } pmfileconflict_t; |