diff options
Diffstat (limited to 'lib/lwres')
| -rw-r--r-- | lib/lwres/api | 2 | ||||
| -rw-r--r-- | lib/lwres/print_p.h | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/lwres/api b/lib/lwres/api index 3d42fccad650..e80d74b8cd03 100644 --- a/lib/lwres/api +++ b/lib/lwres/api @@ -1,3 +1,3 @@ LIBINTERFACE = 30 -LIBREVISION = 7 +LIBREVISION = 8 LIBAGE = 0 diff --git a/lib/lwres/print_p.h b/lib/lwres/print_p.h index 3f739bf85542..8305211664cd 100644 --- a/lib/lwres/print_p.h +++ b/lib/lwres/print_p.h @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001, 2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: print_p.h,v 1.2.2.1 2004-08-28 06:21:13 marka Exp $ */ +/* $Id: print_p.h,v 1.2.2.3 2011-01-14 23:45:15 tbox Exp $ */ #ifndef LWRES_PRINT_P_H #define LWRES_PRINT_P_H 1 @@ -47,7 +47,7 @@ #ifdef __GNUC__ #define LWRES_FORMAT_PRINTF(fmt, args) \ - __attribute__((__format__(__printf__, fmt, args))) + __attribute__((__format__(__printf__, fmt, args))) #else #define LWRES_FORMAT_PRINTF(fmt, args) #endif @@ -67,17 +67,20 @@ LWRES_LANG_BEGINDECLS int lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) LWRES_FORMAT_PRINTF(3, 0); +#undef vsnprintf #define vsnprintf lwres__print_vsnprintf int lwres__print_snprintf(char *str, size_t size, const char *format, ...) LWRES_FORMAT_PRINTF(3, 4); +#undef snprintf #define snprintf lwres__print_snprintf #endif /* LWRES_PLATFORM_NEEDVSNPRINTF */ #ifdef LWRES_PLATFORM_NEEDSPRINTF int lwres__print_sprintf(char *str, const char *format, ...) LWRES_FORMAT_PRINTF(2, 3); +#undef sprintf #define sprintf lwres__print_sprintf #endif |