Commit e9bae31b authored by Niels Möller's avatar Niels Möller

Inline workaround for gcc-5.

parent d98143a5
2016-04-18 Niels Möller <nisse@lysator.liu.se>
* argp-fmtstream.h (ARGP_FS_EI): Use __attribute__
((__gnu_inline__)) if available, for compatibility with gcc-5.
* argp.h (ARGP_EI): Likewise.
2014-10-02 Niels Möller <nisse@lysator.liu.se> 2014-10-02 Niels Möller <nisse@lysator.liu.se>
* strndup.c (strndup): Fixed off-by-one error, and failure check. * strndup.c (strndup): Fixed off-by-one error, and failure check.
......
...@@ -216,7 +216,11 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); ...@@ -216,7 +216,11 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
#endif #endif
#ifndef ARGP_FS_EI #ifndef ARGP_FS_EI
#define ARGP_FS_EI extern inline # ifdef __GNUC_STDC_INLINE__
# define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
# else
# define ARGP_FS_EI extern inline
# endif
#endif #endif
ARGP_FS_EI size_t ARGP_FS_EI size_t
......
...@@ -561,8 +561,12 @@ __argp_short_program_name(const struct argp_state *state) __THROW; ...@@ -561,8 +561,12 @@ __argp_short_program_name(const struct argp_state *state) __THROW;
# endif # endif
# ifndef ARGP_EI # ifndef ARGP_EI
# ifdef __GNUC_STDC_INLINE__
# define ARGP_EI extern __inline__ __attribute__ ((__gnu_inline__))
# else
# define ARGP_EI extern __inline__ # define ARGP_EI extern __inline__
# endif # endif
# endif
ARGP_EI void ARGP_EI void
__argp_usage (__const struct argp_state *__state) __argp_usage (__const struct argp_state *__state)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment