Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/alpm.h
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-06-28 14:33:55 +1000
committerAllan McRae <allan@archlinux.org>2011-06-28 23:28:23 +1000
commit220842b37ba484a452f5e4d8071d91d3f2b6c2d4 (patch)
treea2ceee8059e1809996c4023c8ff31ad25552fb85 /lib/libalpm/alpm.h
parent6d876f9b6be055d54e50d42a34c267aad64c0b21 (diff)
Rename pmconflict_t to alpm_conflict_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/alpm.h')
-rw-r--r--lib/libalpm/alpm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 53ff4a9f..ff966f18 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -122,11 +122,11 @@ typedef struct _alpm_depmissing_t {
} alpm_depmissing_t;
/** Conflict */
-typedef struct _pmconflict_t {
+typedef struct _alpm_conflict_t {
char *package1;
char *package2;
char *reason;
-} pmconflict_t;
+} alpm_conflict_t;
/** File conflict */
typedef struct _pmfileconflict_t {