security/lsh/patches/patch-src_argp_argp-fmtstream.h

   1 $NetBSD$
   2
   3 --- src/argp/argp-fmtstream.h.orig      2004-03-01 22:18:45.000000000 +0000
   4 +++ src/argp/argp-fmtstream.h
   5 @@ -153,6 +153,7 @@ extern ssize_t argp_fmtstream_printf (ar
   6                                       __const char *__fmt, ...)
   7       PRINTF_STYLE(2,3);
   8
   9 +#if 0
  10  extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
  11  extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
  12
  13 @@ -163,6 +164,7 @@ extern size_t __argp_fmtstream_write (ar
  14                                       __const char *__str, size_t __len);
  15  extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
  16                                     __const char *__str, size_t __len);
  17 +#endif
  18  \f
  19  /* Access macros for various bits of state.  */
  20  #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
  21 @@ -172,6 +174,7 @@ extern size_t argp_fmtstream_write (argp
  22  #define __argp_fmtstream_rmargin argp_fmtstream_rmargin
  23  #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
  24
  25 +#if 0
  26  /* Set __FS's left margin to LMARGIN and return the old value.  */
  27  extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
  28                                           size_t __lmargin);
  29 @@ -193,6 +196,7 @@ extern size_t __argp_fmtstream_set_wmarg
  30  /* Return the column number of the current output point in __FS.  */
  31  extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
  32  extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
  33 +#endif
  34
  35  /* Internal routines.  */
  36  extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
  37 @@ -216,7 +220,11 @@ extern int __argp_fmtstream_ensure (argp
  38  #endif
  39
  40  #ifndef ARGP_FS_EI
  41 +#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
  42  #define ARGP_FS_EI extern inline
  43 +#else
  44 +#define ARGP_FS_EI inline
  45 +#endif
  46  #endif
  47
  48  ARGP_FS_EI size_t