Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=be61a5a8950871cecd74cb48ab67a8917e8f2c01
commit be61a5a8950871cecd74cb48ab67a8917e8f2c01 Author: Michel Hermier <[email protected]> Date: Tue Aug 19 10:21:02 2014 +0200 libpacman: Move __pmlist_t to flist.h. diff --git a/lib/libpacman/util/flist.h b/lib/libpacman/util/flist.h index b818339..1f74717 100644 --- a/lib/libpacman/util/flist.h +++ b/lib/libpacman/util/flist.h @@ -26,10 +26,18 @@ #include "util/fcallback.h" +/* Chained list struct */ +struct __pmlist_t { + struct __pmlist_t *prev; + struct __pmlist_t *next; + void *m_data; +}; + #ifdef __cplusplus #ifdef F_NOCOMPAT class FListItemBase + : public __pmlist_t { public: ListItem() diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 26b0371..c66cba3 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -27,18 +27,13 @@ #include "stdbool.h" #include "util/fcallback.h" +#include "util/flist.h" #ifdef __cplusplus extern "C" { #endif #ifndef F_NOCOMPAT -/* Chained list struct */ -struct __pmlist_t { - struct __pmlist_t *prev; - struct __pmlist_t *next; - void *m_data; -}; typedef struct __pmlist_t FPtrList; typedef struct __pmlist_t FPtrListItem; @@ -47,8 +42,6 @@ typedef struct FPtrList FPtrList; typedef struct FPtrListItem FPtrListItem; #endif -#include "util/flist.h" - #define _FREELIST(p, f) do { if(p) { FVisitor visitor = { (FVisitorFunc)f, NULL }; f_ptrlist_delete(p, &visitor); p = NULL; } } while(0) #define FREELIST(p) _FREELIST(p, free) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
