tachi
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg: clean up PKG_CONFIG_PATH_SEP_S nonsense

feature/tap-sh
William Pitcock 2012-05-02 19:07:38 +00:00
parent b91bdcd31a
commit 52433aa27a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg.c
View File

@ -27,13 +27,11 @@
#define PKG_CONFIG_EXT ".pc" #define PKG_CONFIG_EXT ".pc"
#define PKG_CONFIG_PATH_SZ (65535) #define PKG_CONFIG_PATH_SZ (65535)
#ifdef _WIN32
/* pkg-config uses ';' on win32 as ':' is part of path */ /* pkg-config uses ';' on win32 as ':' is part of path */
#ifdef _WIN32
#define PKG_CONFIG_PATH_SEP_S ";" #define PKG_CONFIG_PATH_SEP_S ";"
#define PKG_CONFIG_PATH_SEP ':'
#else #else
#define PKG_CONFIG_PATH_SEP_S ":" #define PKG_CONFIG_PATH_SEP_S ":"
#define PKG_CONFIG_PATH_SEP ':'
#endif #endif
static inline size_t static inline size_t
@ -48,7 +46,7 @@ path_split(const char *text, char ***parv)
*parv = malloc(sizeof (void *)); *parv = malloc(sizeof (void *));
iter = workbuf = strdup(text); iter = workbuf = strdup(text);
while ((p = strtok(iter, " ")) != NULL) while ((p = strtok(iter, PKG_CONFIG_PATH_SEP_S)) != NULL)
{ {
*parv[count] = strdup(p); *parv[count] = strdup(p);
count++, iter = NULL; count++, iter = NULL;