diff options
author | Dan McGee <dan@archlinux.org> | 2011-10-22 02:29:47 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-10-22 02:29:47 +0200 |
commit | 90ddcbe71d483884b7627237121b1dee05b07dd0 (patch) | |
tree | 3a7ab12ede83453d24747065f5f27a78c8c51fbf /src/pacman/util.h | |
parent | 33bb7dbd356bd1164a1bd6418c0615808fae13f7 (diff) | |
parent | d6e3446e70bcda9c0f28d80110d588106daa4b5c (diff) | |
download | pacman-90ddcbe71d483884b7627237121b1dee05b07dd0.tar.gz pacman-90ddcbe71d483884b7627237121b1dee05b07dd0.tar.xz |
Merge branch 'maint'
Conflicts:
src/pacman/package.c
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/util.h')
-rw-r--r-- | src/pacman/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pacman/util.h b/src/pacman/util.h index dc6995ca..6ec962ff 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -75,8 +75,8 @@ int select_question(int count); int multiselect_question(char *array, int count); int yesno(char *fmt, ...); int noyes(char *fmt, ...); + int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); -int pm_fprintf(FILE *stream, alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); int pm_asprintf(char **string, const char *format, ...); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); |