Imported Upstream version 3.2.0

[debian/amanda] / gnulib / printf-parse.h

diff --git a/gnulib/printf-parse.h b/gnulib/printf-parse.h
index de7fc49b6fbc17d79196cdd59b6eac099ba63624..0f2b708209eedb792dfd8bf56848a6d899ccb781 100644 (file)
--- a/gnulib/printf-parse.h
+++ b/gnulib/printf-parse.h
@@ -1,9 +1,10 @@
 /* Parse printf format string.
 /* Parse printf format string.

-   Copyright (C) 1999, 2002-2003, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2009-2010 Free Software
+   Foundation, Inc.

 
    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
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -26,15 +27,15 @@
 
 
 /* Flags */
 
 
 /* Flags */

-#define FLAG_GROUP      1      /* ' flag */
-#define FLAG_LEFT       2      /* - flag */
-#define FLAG_SHOWSIGN   4      /* + flag */
-#define FLAG_SPACE      8      /* space flag */
-#define FLAG_ALT       16      /* # flag */
-#define FLAG_ZERO      32
+#define FLAG_GROUP       1      /* ' flag */
+#define FLAG_LEFT        2      /* - flag */
+#define FLAG_SHOWSIGN    4      /* + flag */
+#define FLAG_SPACE       8      /* space flag */
+#define FLAG_ALT        16      /* # flag */
+#define FLAG_ZERO       32

 
 /* arg_index value indicating that no argument is consumed.  */
 
 /* arg_index value indicating that no argument is consumed.  */

-#define ARG_NONE       (~(size_t)0)
+#define ARG_NONE        (~(size_t)0)

 
 /* xxx_directive: A parsed directive.
    xxx_directives: A parsed format string.  */
 
 /* xxx_directive: A parsed directive.
    xxx_directives: A parsed format string.  */


@@ -163,10 +164,10 @@ extern int
        u8_printf_parse (const uint8_t *format, u8_directives *d, arguments *a);
 extern int
        u16_printf_parse (const uint16_t *format, u16_directives *d,
        u8_printf_parse (const uint8_t *format, u8_directives *d, arguments *a);
 extern int
        u16_printf_parse (const uint16_t *format, u16_directives *d,

-                        arguments *a);
+                         arguments *a);

 extern int
        u32_printf_parse (const uint32_t *format, u32_directives *d,
 extern int
        u32_printf_parse (const uint32_t *format, u32_directives *d,

-                        arguments *a);
+                         arguments *a);

 #else
 # ifdef STATIC
 STATIC
 #else
 # ifdef STATIC
 STATIC