From 20f73d6299c08fa79c2c8edd3d1955e208e701cb Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 12 Jul 2007 15:20:43 -0400 Subject: Remove versioncmp.{c,h}, clean up selective #ifdefs Remove versioncmp.c by moving all functions to locations that make sense. Move replacement functions (for building without glibc) into util.c where they belong, and do proper checks for them instead of using __sun__, etc. Signed-off-by: Dan McGee --- lib/libalpm/util.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/libalpm/util.h') diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 5fa8269d..8d84d87f 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -54,9 +54,11 @@ int _alpm_ldconfig(const char *root); void _alpm_time2string(time_t t, char *buffer); int _alpm_str_cmp(const void *s1, const void *s2); -#ifdef __sun__ -char* strsep(char** str, const char* delims); -char* mkdtemp(char *template); +#ifndef HAVE_STRVERSCMP +static int strverscmp(const char *, const char *); +#endif +#ifndef HAVE_STRSEP +char *strsep(char **, const char *); #endif /* check exported library symbols with: nm -C -D */ -- cgit v1.2.3-24-g4f1b