X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c7e016d34b8f0429c0cd9e5366625fdf83776297..a2e9d1472af7f3693cd7843eb3ff4d8b23423fc8:/lib/configuration.h diff --git a/lib/configuration.h b/lib/configuration.h index f5b2061..148d08f 100644 --- a/lib/configuration.h +++ b/lib/configuration.h @@ -22,9 +22,8 @@ #ifndef CONFIGURATION_H #define CONFIGURATION_H -#include - #include "speaker-protocol.h" +#include "regexp.h" #include "rights.h" #include "addr.h" @@ -71,7 +70,7 @@ struct collectionlist { /** @brief A track name part */ struct namepart { char *part; /* part */ - pcre *re; /* compiled regexp */ + regexp *re; /* compiled regexp */ char *res; /* regexp as a string */ char *replace; /* replacement string */ char *context; /* context glob */ @@ -89,7 +88,7 @@ struct transform { char *type; /* track or dir */ char *context; /* sort or choose */ char *replace; /* substitution string */ - pcre *re; /* compiled re */ + regexp *re; /* compiled re */ unsigned flags; /* regexp flags */ };