Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4802c4c56044fc559c04984e633f6be969188cb4
commit 4802c4c56044fc559c04984e633f6be969188cb4
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Oct 30 14:09:46 2013 +0100
libpacman: Make pmconflit_t public, should be used instead of PM_CONFLICT in
new code.
diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt
index acd6158..c33017a 100644
--- a/doc/libpacman-changes.txt
+++ b/doc/libpacman-changes.txt
@@ -23,6 +23,7 @@ pacman_trans_cb_progress: Second argument (pkgname) is now a
const.
==== Symbols added:
+pmconflict_t: is now public and deprecate PM_CONFLICT.
pmdb_t: is now public and deprecate PM_DB.
pmgrp_t: is now public and deprecate PM_GRP.
pmlist_t: is now public and deprecate PM_LIST.
diff --git a/lib/libpacman/conflict.h b/lib/libpacman/conflict.h
index 1cdc1d9..75002f0 100644
--- a/lib/libpacman/conflict.h
+++ b/lib/libpacman/conflict.h
@@ -21,17 +21,16 @@
#ifndef _PACMAN_CONFLICT_H
#define _PACMAN_CONFLICT_H
-#include "db.h"
#include "trans.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 *_pacman_checkconflicts(pmtrans_t *trans, pmdb_t *db, pmlist_t
*packages);
pmlist_t *_pacman_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root,
pmlist_t **skip_list);
diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h
index 3e802fa..3817d73 100644
--- a/lib/libpacman/pacman.h
+++ b/lib/libpacman/pacman.h
@@ -46,6 +46,7 @@ extern "C" {
* Structures (opaque)
*/
+typedef struct __pmconflict_t pmconflict_t;
typedef struct __pmdb_t pmdb_t;
typedef struct __pmgrp_t pmgrp_t;
typedef struct __pmlist_t pmlist_t;
@@ -407,7 +408,7 @@ enum {
PM_CONFLICT_CTARGET
};
-void *pacman_conflict_getinfo(PM_CONFLICT *conflict, unsigned char parm);
+void *pacman_conflict_getinfo(pmconflict_t*conflict, unsigned char parm);
/*
* Helpers
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
