From cc1d8fa9c948c0ef4b1e825e0583fbf73c79f3fd Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 25 Aug 2018 23:09:08 +0200 Subject: m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- libsimple.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libsimple.h b/libsimple.h index 4d3520e..a9562ff 100644 --- a/libsimple.h +++ b/libsimple.h @@ -633,9 +633,8 @@ int libsimple_vasprintf(char **, const char *, va_list); #endif -#ifndef asprintfa -# if defined(__GNUC__) && !defined(__clang__) -# define asprintfa(__fmt, ...) /* TODO test */\ +#if defined(__GNUC__) && !defined(__clang__) +# define libsimple_asprintfa(__fmt, ...) /* TODO test */\ ({\ const char *__f = (__fmt);\ char *__ret = NULL;\ @@ -651,13 +650,14 @@ int libsimple_vasprintf(char **, const char *, va_list); __ret;\ }\ }) +# ifndef asprintfa +# define asprintfa(...) libsimple_asprintfa(__VA_ARGS__) # endif #endif -#ifndef vasprintfa -# if defined(__GNUC__) || defined(__clang__) -# define vasprintfa(__fmt, __ap) /* TODO test */\ +#if defined(__GNUC__) || defined(__clang__) +# define libsimple_vasprintfa(__fmt, __ap) /* TODO test */\ ({\ const char *__f = (__fmt);\ va_list __a = (__ap);\ @@ -676,6 +676,8 @@ int libsimple_vasprintf(char **, const char *, va_list); va_end(__a2);\ __ret;\ }) +# ifndef vasprintfa +# define vasprintfa(fmt, ap) libsimple_vasprintfa(fmt, ap) # endif #endif -- cgit v1.2.3-70-g09d2