All four patches were merged in master, thanks! Jérémie
On 14 September 2016 at 20:32, Michael Jeanson <[email protected]> wrote: > Signed-off-by: Michael Jeanson <[email protected]> > --- > include/babeltrace/babeltrace-internal.h | 4 ++-- > include/babeltrace/compat/string.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/babeltrace/babeltrace-internal.h > b/include/babeltrace/babeltrace-internal.h > index 2f15a68..6384eee 100644 > --- a/include/babeltrace/babeltrace-internal.h > +++ b/include/babeltrace/babeltrace-internal.h > @@ -84,14 +84,14 @@ extern int babeltrace_verbose, babeltrace_debug; > #define _bt_printf_perror(fp, fmt, args...) \ > ({ \ > char buf[PERROR_BUFLEN] = "Error in strerror_r()"; \ > - compat_strerror_r(errno, buf, sizeof(buf)); \ > + bt_strerror_r(errno, buf, sizeof(buf)); \ > _bt_printfe(fp, "error", buf, fmt, ## args); \ > }) > > #define _bt_printfl_perror(fp, lineno, fmt, args...) \ > ({ \ > char buf[PERROR_BUFLEN] = "Error in strerror_r()"; \ > - compat_strerror_r(errno, buf, sizeof(buf)); \ > + bt_strerror_r(errno, buf, sizeof(buf)); \ > _bt_printfle(fp, "error", lineno, buf, fmt, ## args); \ > }) > > diff --git a/include/babeltrace/compat/string.h > b/include/babeltrace/compat/string.h > index 6092616..2aa7bc3 100644 > --- a/include/babeltrace/compat/string.h > +++ b/include/babeltrace/compat/string.h > @@ -30,7 +30,7 @@ > > /* XSI-compliant strerror_r */ > static inline > -int compat_strerror_r(int errnum, char *buf, size_t buflen) > +int bt_strerror_r(int errnum, char *buf, size_t buflen) > { > return strerror_r(errnum, buf, buflen); > } > @@ -39,7 +39,7 @@ int compat_strerror_r(int errnum, char *buf, size_t buflen) > > /* GNU-compliant strerror_r */ > static inline > -int compat_strerror_r(int errnum, char *buf, size_t buflen) > +int bt_strerror_r(int errnum, char *buf, size_t buflen) > { > char *retbuf; > > -- > 2.7.4 > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
