From 9108d06bd3d3082568489f3988193a878bb506f1 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 18 Aug 2003 09:04:37 +0000 Subject: Sync with gnulib, and indent nested cpp directives. --- lib/vasprintf.h | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'lib') diff --git a/lib/vasprintf.h b/lib/vasprintf.h index 0b4808e54..0ab75ccf4 100644 --- a/lib/vasprintf.h +++ b/lib/vasprintf.h @@ -1,20 +1,19 @@ /* vsprintf with automatic memory allocation. Copyright (C) 2002-2003 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _VASPRINTF_H #define _VASPRINTF_H @@ -22,29 +21,29 @@ #if HAVE_VASPRINTF /* Get asprintf(), vasprintf() declarations. */ -#include +# include #else /* Get va_list. */ -#include +# include -#ifndef __attribute__ +# ifndef __attribute__ /* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ -# define __attribute__(Spec) /* empty */ -# endif +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ +# define __attribute__(Spec) /* empty */ +# endif /* The __-protected variants of `format' and `printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __format__ format -# define __printf__ printf +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) +# define __format__ format +# define __printf__ printf +# endif # endif -#endif -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif +# endif /* Write formatted output to a string dynamically allocated with malloc(). If the memory allocation succeeds, store the address of the string in @@ -55,9 +54,9 @@ extern int asprintf (char **result, const char *format, ...) extern int vasprintf (char **result, const char *format, va_list args) __attribute__ ((__format__ (__printf__, 2, 0))); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif #endif -- cgit v1.2.3-70-g09d2