gnu/packages/patches/ustr-fix-build-with-gcc-5.patch

   1 This patch allows to compile the 'ustr' package with gcc-5.
   2
   3 Patch copied from Debian:
   4
   5 https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/commit/?id=fb2528fef188b4de51a27c4f688042c36d2d7a18
   6
   7 From: Václav Ovsík <vaclav.ovsik@gmail.com>
   8 Subject: [PATCH] fixes/gnu-inline
   9
  10 This patch adds `__attribute__ ((gnu_inline))' into prototype macros
  11 before `inline' to force GNU89 behaviour of inline functions
  12 in C99 mode.
  13 See http://www.gnu.org/software/gcc/gcc-5/porting_to.html
  14
  15 Signed-off-by: Václav Ovsík <vaclav.ovsik@gmail.com>
  16
  17 ---
  18  ustr-b-dbg-code.c       | 8 ++++----
  19  ustr-b-opt-code.c       | 8 ++++----
  20  ustr-cmp-dbg-code.c     | 8 ++++----
  21  ustr-cmp-opt-code.c     | 8 ++++----
  22  ustr-compiler.h         | 4 ++--
  23  ustr-fmt-dbg-code.c     | 8 ++++----
  24  ustr-fmt-opt-code.c     | 8 ++++----
  25  ustr-ins-dbg-code.c     | 8 ++++----
  26  ustr-ins-opt-code.c     | 8 ++++----
  27  ustr-io-dbg-code.c      | 8 ++++----
  28  ustr-io-opt-code.c      | 8 ++++----
  29  ustr-main-dbg-code.c    | 2 +-
  30  ustr-main-opt-code.c    | 2 +-
  31  ustr-parse-dbg-code.c   | 8 ++++----
  32  ustr-parse-opt-code.c   | 8 ++++----
  33  ustr-pool-dbg-code.c    | 8 ++++----
  34  ustr-pool-opt-code.c    | 8 ++++----
  35  ustr-replace-dbg-code.c | 8 ++++----
  36  ustr-replace-opt-code.c | 8 ++++----
  37  ustr-sc-dbg-code.c      | 8 ++++----
  38  ustr-sc-opt-code.c      | 8 ++++----
  39  ustr-set-dbg-code.c     | 8 ++++----
  40  ustr-set-opt-code.c     | 8 ++++----
  41  ustr-split-dbg-code.c   | 8 ++++----
  42  ustr-split-opt-code.c   | 8 ++++----
  43  ustr-spn-dbg-code.c     | 8 ++++----
  44  ustr-spn-opt-code.c     | 8 ++++----
  45  ustr-srch-dbg-code.c    | 8 ++++----
  46  ustr-srch-opt-code.c    | 8 ++++----
  47  ustr-sub-dbg-code.c     | 8 ++++----
  48  ustr-sub-opt-code.c     | 8 ++++----
  49  ustr-utf8-dbg-code.c    | 8 ++++----
  50  ustr-utf8-opt-code.c    | 8 ++++----
  51  33 files changed, 124 insertions(+), 124 deletions(-)
  52
  53 diff --git a/ustr-b-dbg-code.c b/ustr-b-dbg-code.c
  54 index 4a7fdac..60e383e 100644
  55 --- a/ustr-b-dbg-code.c
  56 +++ b/ustr-b-dbg-code.c
  57 @@ -3,11 +3,11 @@
  58  #include "ustr-conf-debug.h"
  59  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
  60  #define USTR_CONF_e_PROTO  extern
  61 -#define USTR_CONF_i_PROTO  extern inline
  62 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
  63  #define USTR_CONF_E_PROTO  extern
  64 -#define USTR_CONF_I_PROTO  extern inline
  65 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
  66  #define USTR_CONF_EI_PROTO extern
  67 -#define USTR_CONF_II_PROTO extern inline
  68 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
  69  #include "ustr-main.h"
  70  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
  71  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
  72 @@ -16,5 +16,5 @@
  73  #undef  USTR_CONF_I_PROTO
  74  #define USTR_CONF_I_PROTO
  75  #undef  USTR_CONF_II_PROTO
  76 -#define USTR_CONF_II_PROTO inline
  77 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
  78  #include "ustr-b.h"
  79 diff --git a/ustr-b-opt-code.c b/ustr-b-opt-code.c
  80 index 45e9e87..4011898 100644
  81 --- a/ustr-b-opt-code.c
  82 +++ b/ustr-b-opt-code.c
  83 @@ -3,11 +3,11 @@
  84  #include "ustr-conf.h"
  85  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
  86  #define USTR_CONF_e_PROTO  extern
  87 -#define USTR_CONF_i_PROTO  extern inline
  88 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
  89  #define USTR_CONF_E_PROTO  extern
  90 -#define USTR_CONF_I_PROTO  extern inline
  91 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
  92  #define USTR_CONF_EI_PROTO extern
  93 -#define USTR_CONF_II_PROTO extern inline
  94 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
  95  #include "ustr-main.h"
  96  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
  97  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
  98 @@ -16,5 +16,5 @@
  99  #undef  USTR_CONF_I_PROTO
 100  #define USTR_CONF_I_PROTO
 101  #undef  USTR_CONF_II_PROTO
 102 -#define USTR_CONF_II_PROTO inline
 103 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 104  #include "ustr-b.h"
 105 diff --git a/ustr-cmp-dbg-code.c b/ustr-cmp-dbg-code.c
 106 index 7b8af33..4c3adc2 100644
 107 --- a/ustr-cmp-dbg-code.c
 108 +++ b/ustr-cmp-dbg-code.c
 109 @@ -3,11 +3,11 @@
 110  #include "ustr-conf-debug.h"
 111  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 112  #define USTR_CONF_e_PROTO  extern
 113 -#define USTR_CONF_i_PROTO  extern inline
 114 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 115  #define USTR_CONF_E_PROTO  extern
 116 -#define USTR_CONF_I_PROTO  extern inline
 117 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 118  #define USTR_CONF_EI_PROTO extern
 119 -#define USTR_CONF_II_PROTO extern inline
 120 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 121  #include "ustr-main.h"
 122  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 123  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 124 @@ -16,5 +16,5 @@
 125  #undef  USTR_CONF_I_PROTO
 126  #define USTR_CONF_I_PROTO
 127  #undef  USTR_CONF_II_PROTO
 128 -#define USTR_CONF_II_PROTO inline
 129 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 130  #include "ustr-cmp.h"
 131 diff --git a/ustr-cmp-opt-code.c b/ustr-cmp-opt-code.c
 132 index 2076d1c..ff5d02c 100644
 133 --- a/ustr-cmp-opt-code.c
 134 +++ b/ustr-cmp-opt-code.c
 135 @@ -3,11 +3,11 @@
 136  #include "ustr-conf.h"
 137  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 138  #define USTR_CONF_e_PROTO  extern
 139 -#define USTR_CONF_i_PROTO  extern inline
 140 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 141  #define USTR_CONF_E_PROTO  extern
 142 -#define USTR_CONF_I_PROTO  extern inline
 143 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 144  #define USTR_CONF_EI_PROTO extern
 145 -#define USTR_CONF_II_PROTO extern inline
 146 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 147  #include "ustr-main.h"
 148  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 149  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 150 @@ -16,5 +16,5 @@
 151  #undef  USTR_CONF_I_PROTO
 152  #define USTR_CONF_I_PROTO
 153  #undef  USTR_CONF_II_PROTO
 154 -#define USTR_CONF_II_PROTO inline
 155 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 156  #include "ustr-cmp.h"
 157 diff --git a/ustr-compiler.h b/ustr-compiler.h
 158 index 9e71276..38ae026 100644
 159 --- a/ustr-compiler.h
 160 +++ b/ustr-compiler.h
 161 @@ -92,7 +92,7 @@
 162  #endif
 163
 164  #if USTR_CONF_COMPILE_USE_INLINE
 165 -#define USTR__INLINE inline
 166 +#define USTR__INLINE  __attribute__ ((gnu_inline)) inline
 167  #else
 168  #define USTR__INLINE /* no inline */
 169  #endif
 170 @@ -123,7 +123,7 @@
 171  # if USTR_CONF_INCLUDE_CODEONLY_HEADERS
 172  #  define USTR_CONF_II_PROTO static USTR__INLINE
 173  # else
 174 -#  define USTR_CONF_II_PROTO extern inline
 175 +#  define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 176  # endif
 177  #endif
 178
 179 diff --git a/ustr-fmt-dbg-code.c b/ustr-fmt-dbg-code.c
 180 index 4249bb1..1f147a0 100644
 181 --- a/ustr-fmt-dbg-code.c
 182 +++ b/ustr-fmt-dbg-code.c
 183 @@ -3,11 +3,11 @@
 184  #include "ustr-conf-debug.h"
 185  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 186  #define USTR_CONF_e_PROTO  extern
 187 -#define USTR_CONF_i_PROTO  extern inline
 188 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 189  #define USTR_CONF_E_PROTO  extern
 190 -#define USTR_CONF_I_PROTO  extern inline
 191 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 192  #define USTR_CONF_EI_PROTO extern
 193 -#define USTR_CONF_II_PROTO extern inline
 194 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 195  #include "ustr-main.h"
 196  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 197  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 198 @@ -16,5 +16,5 @@
 199  #undef  USTR_CONF_I_PROTO
 200  #define USTR_CONF_I_PROTO
 201  #undef  USTR_CONF_II_PROTO
 202 -#define USTR_CONF_II_PROTO inline
 203 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 204  #include "ustr-fmt.h"
 205 diff --git a/ustr-fmt-opt-code.c b/ustr-fmt-opt-code.c
 206 index c73e375..989b29f 100644
 207 --- a/ustr-fmt-opt-code.c
 208 +++ b/ustr-fmt-opt-code.c
 209 @@ -3,11 +3,11 @@
 210  #include "ustr-conf.h"
 211  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 212  #define USTR_CONF_e_PROTO  extern
 213 -#define USTR_CONF_i_PROTO  extern inline
 214 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 215  #define USTR_CONF_E_PROTO  extern
 216 -#define USTR_CONF_I_PROTO  extern inline
 217 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 218  #define USTR_CONF_EI_PROTO extern
 219 -#define USTR_CONF_II_PROTO extern inline
 220 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 221  #include "ustr-main.h"
 222  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 223  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 224 @@ -16,5 +16,5 @@
 225  #undef  USTR_CONF_I_PROTO
 226  #define USTR_CONF_I_PROTO
 227  #undef  USTR_CONF_II_PROTO
 228 -#define USTR_CONF_II_PROTO inline
 229 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 230  #include "ustr-fmt.h"
 231 diff --git a/ustr-ins-dbg-code.c b/ustr-ins-dbg-code.c
 232 index 39f9bba..4c6d5ea 100644
 233 --- a/ustr-ins-dbg-code.c
 234 +++ b/ustr-ins-dbg-code.c
 235 @@ -3,11 +3,11 @@
 236  #include "ustr-conf-debug.h"
 237  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 238  #define USTR_CONF_e_PROTO  extern
 239 -#define USTR_CONF_i_PROTO  extern inline
 240 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 241  #define USTR_CONF_E_PROTO  extern
 242 -#define USTR_CONF_I_PROTO  extern inline
 243 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 244  #define USTR_CONF_EI_PROTO extern
 245 -#define USTR_CONF_II_PROTO extern inline
 246 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 247  #include "ustr-main.h"
 248  #include "ustr-fmt.h"
 249  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 250 @@ -17,5 +17,5 @@
 251  #undef  USTR_CONF_I_PROTO
 252  #define USTR_CONF_I_PROTO
 253  #undef  USTR_CONF_II_PROTO
 254 -#define USTR_CONF_II_PROTO inline
 255 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 256  #include "ustr-ins.h"
 257 diff --git a/ustr-ins-opt-code.c b/ustr-ins-opt-code.c
 258 index 1aca827..859b44d 100644
 259 --- a/ustr-ins-opt-code.c
 260 +++ b/ustr-ins-opt-code.c
 261 @@ -3,11 +3,11 @@
 262  #include "ustr-conf.h"
 263  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 264  #define USTR_CONF_e_PROTO  extern
 265 -#define USTR_CONF_i_PROTO  extern inline
 266 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 267  #define USTR_CONF_E_PROTO  extern
 268 -#define USTR_CONF_I_PROTO  extern inline
 269 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 270  #define USTR_CONF_EI_PROTO extern
 271 -#define USTR_CONF_II_PROTO extern inline
 272 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 273  #include "ustr-main.h"
 274  #include "ustr-fmt.h"
 275  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 276 @@ -17,5 +17,5 @@
 277  #undef  USTR_CONF_I_PROTO
 278  #define USTR_CONF_I_PROTO
 279  #undef  USTR_CONF_II_PROTO
 280 -#define USTR_CONF_II_PROTO inline
 281 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 282  #include "ustr-ins.h"
 283 diff --git a/ustr-io-dbg-code.c b/ustr-io-dbg-code.c
 284 index c361c93..d42e43f 100644
 285 --- a/ustr-io-dbg-code.c
 286 +++ b/ustr-io-dbg-code.c
 287 @@ -3,11 +3,11 @@
 288  #include "ustr-conf-debug.h"
 289  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 290  #define USTR_CONF_e_PROTO  extern
 291 -#define USTR_CONF_i_PROTO  extern inline
 292 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 293  #define USTR_CONF_E_PROTO  extern
 294 -#define USTR_CONF_I_PROTO  extern inline
 295 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 296  #define USTR_CONF_EI_PROTO extern
 297 -#define USTR_CONF_II_PROTO extern inline
 298 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 299  #include "ustr-main.h"
 300  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 301  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 302 @@ -16,5 +16,5 @@
 303  #undef  USTR_CONF_I_PROTO
 304  #define USTR_CONF_I_PROTO
 305  #undef  USTR_CONF_II_PROTO
 306 -#define USTR_CONF_II_PROTO inline
 307 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 308  #include "ustr-io.h"
 309 diff --git a/ustr-io-opt-code.c b/ustr-io-opt-code.c
 310 index b1b4525..ae8de87 100644
 311 --- a/ustr-io-opt-code.c
 312 +++ b/ustr-io-opt-code.c
 313 @@ -3,11 +3,11 @@
 314  #include "ustr-conf.h"
 315  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 316  #define USTR_CONF_e_PROTO  extern
 317 -#define USTR_CONF_i_PROTO  extern inline
 318 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 319  #define USTR_CONF_E_PROTO  extern
 320 -#define USTR_CONF_I_PROTO  extern inline
 321 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 322  #define USTR_CONF_EI_PROTO extern
 323 -#define USTR_CONF_II_PROTO extern inline
 324 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 325  #include "ustr-main.h"
 326  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 327  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 328 @@ -16,5 +16,5 @@
 329  #undef  USTR_CONF_I_PROTO
 330  #define USTR_CONF_I_PROTO
 331  #undef  USTR_CONF_II_PROTO
 332 -#define USTR_CONF_II_PROTO inline
 333 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 334  #include "ustr-io.h"
 335 diff --git a/ustr-main-dbg-code.c b/ustr-main-dbg-code.c
 336 index 4b821ce..abaa53a 100644
 337 --- a/ustr-main-dbg-code.c
 338 +++ b/ustr-main-dbg-code.c
 339 @@ -7,5 +7,5 @@
 340  #define USTR_CONF_E_PROTO  extern
 341  #define USTR_CONF_I_PROTO
 342  #define USTR_CONF_EI_PROTO extern
 343 -#define USTR_CONF_II_PROTO inline
 344 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 345  #include "ustr-main.h"
 346 diff --git a/ustr-main-opt-code.c b/ustr-main-opt-code.c
 347 index 233fb60..7ef6e98 100644
 348 --- a/ustr-main-opt-code.c
 349 +++ b/ustr-main-opt-code.c
 350 @@ -7,5 +7,5 @@
 351  #define USTR_CONF_E_PROTO  extern
 352  #define USTR_CONF_I_PROTO
 353  #define USTR_CONF_EI_PROTO extern
 354 -#define USTR_CONF_II_PROTO inline
 355 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 356  #include "ustr-main.h"
 357 diff --git a/ustr-parse-dbg-code.c b/ustr-parse-dbg-code.c
 358 index c9653af..6e1707d 100644
 359 --- a/ustr-parse-dbg-code.c
 360 +++ b/ustr-parse-dbg-code.c
 361 @@ -3,11 +3,11 @@
 362  #include "ustr-conf-debug.h"
 363  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 364  #define USTR_CONF_e_PROTO  extern
 365 -#define USTR_CONF_i_PROTO  extern inline
 366 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 367  #define USTR_CONF_E_PROTO  extern
 368 -#define USTR_CONF_I_PROTO  extern inline
 369 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 370  #define USTR_CONF_EI_PROTO extern
 371 -#define USTR_CONF_II_PROTO extern inline
 372 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 373  #include "ustr-main.h"
 374  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 375  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 376 @@ -16,5 +16,5 @@
 377  #undef  USTR_CONF_I_PROTO
 378  #define USTR_CONF_I_PROTO
 379  #undef  USTR_CONF_II_PROTO
 380 -#define USTR_CONF_II_PROTO inline
 381 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 382  #include "ustr-parse.h"
 383 diff --git a/ustr-parse-opt-code.c b/ustr-parse-opt-code.c
 384 index 0c8df4d..fc96db2 100644
 385 --- a/ustr-parse-opt-code.c
 386 +++ b/ustr-parse-opt-code.c
 387 @@ -3,11 +3,11 @@
 388  #include "ustr-conf.h"
 389  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 390  #define USTR_CONF_e_PROTO  extern
 391 -#define USTR_CONF_i_PROTO  extern inline
 392 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 393  #define USTR_CONF_E_PROTO  extern
 394 -#define USTR_CONF_I_PROTO  extern inline
 395 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 396  #define USTR_CONF_EI_PROTO extern
 397 -#define USTR_CONF_II_PROTO extern inline
 398 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 399  #include "ustr-main.h"
 400  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 401  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 402 @@ -16,5 +16,5 @@
 403  #undef  USTR_CONF_I_PROTO
 404  #define USTR_CONF_I_PROTO
 405  #undef  USTR_CONF_II_PROTO
 406 -#define USTR_CONF_II_PROTO inline
 407 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 408  #include "ustr-parse.h"
 409 diff --git a/ustr-pool-dbg-code.c b/ustr-pool-dbg-code.c
 410 index adf7519..957f9ca 100644
 411 --- a/ustr-pool-dbg-code.c
 412 +++ b/ustr-pool-dbg-code.c
 413 @@ -3,11 +3,11 @@
 414  #include "ustr-conf-debug.h"
 415  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 416  #define USTR_CONF_e_PROTO  extern
 417 -#define USTR_CONF_i_PROTO  extern inline
 418 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 419  #define USTR_CONF_E_PROTO  extern
 420 -#define USTR_CONF_I_PROTO  extern inline
 421 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 422  #define USTR_CONF_EI_PROTO extern
 423 -#define USTR_CONF_II_PROTO extern inline
 424 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 425  #include "ustr-main.h"
 426  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 427  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 428 @@ -16,5 +16,5 @@
 429  #undef  USTR_CONF_I_PROTO
 430  #define USTR_CONF_I_PROTO
 431  #undef  USTR_CONF_II_PROTO
 432 -#define USTR_CONF_II_PROTO inline
 433 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 434  #include "ustr-pool.h"
 435 diff --git a/ustr-pool-opt-code.c b/ustr-pool-opt-code.c
 436 index 2b0367c..c1b2413 100644
 437 --- a/ustr-pool-opt-code.c
 438 +++ b/ustr-pool-opt-code.c
 439 @@ -3,11 +3,11 @@
 440  #include "ustr-conf.h"
 441  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 442  #define USTR_CONF_e_PROTO  extern
 443 -#define USTR_CONF_i_PROTO  extern inline
 444 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 445  #define USTR_CONF_E_PROTO  extern
 446 -#define USTR_CONF_I_PROTO  extern inline
 447 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 448  #define USTR_CONF_EI_PROTO extern
 449 -#define USTR_CONF_II_PROTO extern inline
 450 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 451  #include "ustr-main.h"
 452  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 453  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 454 @@ -16,5 +16,5 @@
 455  #undef  USTR_CONF_I_PROTO
 456  #define USTR_CONF_I_PROTO
 457  #undef  USTR_CONF_II_PROTO
 458 -#define USTR_CONF_II_PROTO inline
 459 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 460  #include "ustr-pool.h"
 461 diff --git a/ustr-replace-dbg-code.c b/ustr-replace-dbg-code.c
 462 index fe02187..90531ac 100644
 463 --- a/ustr-replace-dbg-code.c
 464 +++ b/ustr-replace-dbg-code.c
 465 @@ -3,11 +3,11 @@
 466  #include "ustr-conf-debug.h"
 467  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 468  #define USTR_CONF_e_PROTO  extern
 469 -#define USTR_CONF_i_PROTO  extern inline
 470 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 471  #define USTR_CONF_E_PROTO  extern
 472 -#define USTR_CONF_I_PROTO  extern inline
 473 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 474  #define USTR_CONF_EI_PROTO extern
 475 -#define USTR_CONF_II_PROTO extern inline
 476 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 477  #include "ustr-main.h"
 478  #include "ustr-set.h"
 479  #include "ustr-srch.h"
 480 @@ -19,5 +19,5 @@
 481  #undef  USTR_CONF_I_PROTO
 482  #define USTR_CONF_I_PROTO
 483  #undef  USTR_CONF_II_PROTO
 484 -#define USTR_CONF_II_PROTO inline
 485 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 486  #include "ustr-replace.h"
 487 diff --git a/ustr-replace-opt-code.c b/ustr-replace-opt-code.c
 488 index e76b3bb..6232753 100644
 489 --- a/ustr-replace-opt-code.c
 490 +++ b/ustr-replace-opt-code.c
 491 @@ -3,11 +3,11 @@
 492  #include "ustr-conf.h"
 493  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 494  #define USTR_CONF_e_PROTO  extern
 495 -#define USTR_CONF_i_PROTO  extern inline
 496 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 497  #define USTR_CONF_E_PROTO  extern
 498 -#define USTR_CONF_I_PROTO  extern inline
 499 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 500  #define USTR_CONF_EI_PROTO extern
 501 -#define USTR_CONF_II_PROTO extern inline
 502 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 503  #include "ustr-main.h"
 504  #include "ustr-set.h"
 505  #include "ustr-srch.h"
 506 @@ -19,5 +19,5 @@
 507  #undef  USTR_CONF_I_PROTO
 508  #define USTR_CONF_I_PROTO
 509  #undef  USTR_CONF_II_PROTO
 510 -#define USTR_CONF_II_PROTO inline
 511 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 512  #include "ustr-replace.h"
 513 diff --git a/ustr-sc-dbg-code.c b/ustr-sc-dbg-code.c
 514 index 0011c63..d7ce317 100644
 515 --- a/ustr-sc-dbg-code.c
 516 +++ b/ustr-sc-dbg-code.c
 517 @@ -3,11 +3,11 @@
 518  #include "ustr-conf-debug.h"
 519  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 520  #define USTR_CONF_e_PROTO  extern
 521 -#define USTR_CONF_i_PROTO  extern inline
 522 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 523  #define USTR_CONF_E_PROTO  extern
 524 -#define USTR_CONF_I_PROTO  extern inline
 525 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 526  #define USTR_CONF_EI_PROTO extern
 527 -#define USTR_CONF_II_PROTO extern inline
 528 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 529  #include "ustr-main.h"
 530  #include "ustr-spn.h"
 531  #include "ustr-utf8.h"
 532 @@ -18,5 +18,5 @@
 533  #undef  USTR_CONF_I_PROTO
 534  #define USTR_CONF_I_PROTO
 535  #undef  USTR_CONF_II_PROTO
 536 -#define USTR_CONF_II_PROTO inline
 537 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 538  #include "ustr-sc.h"
 539 diff --git a/ustr-sc-opt-code.c b/ustr-sc-opt-code.c
 540 index 7cb81ba..4a97ed9 100644
 541 --- a/ustr-sc-opt-code.c
 542 +++ b/ustr-sc-opt-code.c
 543 @@ -3,11 +3,11 @@
 544  #include "ustr-conf.h"
 545  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 546  #define USTR_CONF_e_PROTO  extern
 547 -#define USTR_CONF_i_PROTO  extern inline
 548 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 549  #define USTR_CONF_E_PROTO  extern
 550 -#define USTR_CONF_I_PROTO  extern inline
 551 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 552  #define USTR_CONF_EI_PROTO extern
 553 -#define USTR_CONF_II_PROTO extern inline
 554 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 555  #include "ustr-main.h"
 556  #include "ustr-spn.h"
 557  #include "ustr-utf8.h"
 558 @@ -18,5 +18,5 @@
 559  #undef  USTR_CONF_I_PROTO
 560  #define USTR_CONF_I_PROTO
 561  #undef  USTR_CONF_II_PROTO
 562 -#define USTR_CONF_II_PROTO inline
 563 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 564  #include "ustr-sc.h"
 565 diff --git a/ustr-set-dbg-code.c b/ustr-set-dbg-code.c
 566 index 023875a..cf77071 100644
 567 --- a/ustr-set-dbg-code.c
 568 +++ b/ustr-set-dbg-code.c
 569 @@ -3,11 +3,11 @@
 570  #include "ustr-conf-debug.h"
 571  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 572  #define USTR_CONF_e_PROTO  extern
 573 -#define USTR_CONF_i_PROTO  extern inline
 574 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 575  #define USTR_CONF_E_PROTO  extern
 576 -#define USTR_CONF_I_PROTO  extern inline
 577 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 578  #define USTR_CONF_EI_PROTO extern
 579 -#define USTR_CONF_II_PROTO extern inline
 580 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 581  #include "ustr-main.h"
 582  #include "ustr-fmt.h"
 583  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 584 @@ -17,5 +17,5 @@
 585  #undef  USTR_CONF_I_PROTO
 586  #define USTR_CONF_I_PROTO
 587  #undef  USTR_CONF_II_PROTO
 588 -#define USTR_CONF_II_PROTO inline
 589 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 590  #include "ustr-set.h"
 591 diff --git a/ustr-set-opt-code.c b/ustr-set-opt-code.c
 592 index e726888..34dcaf6 100644
 593 --- a/ustr-set-opt-code.c
 594 +++ b/ustr-set-opt-code.c
 595 @@ -3,11 +3,11 @@
 596  #include "ustr-conf.h"
 597  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 598  #define USTR_CONF_e_PROTO  extern
 599 -#define USTR_CONF_i_PROTO  extern inline
 600 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 601  #define USTR_CONF_E_PROTO  extern
 602 -#define USTR_CONF_I_PROTO  extern inline
 603 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 604  #define USTR_CONF_EI_PROTO extern
 605 -#define USTR_CONF_II_PROTO extern inline
 606 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 607  #include "ustr-main.h"
 608  #include "ustr-fmt.h"
 609  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 610 @@ -17,5 +17,5 @@
 611  #undef  USTR_CONF_I_PROTO
 612  #define USTR_CONF_I_PROTO
 613  #undef  USTR_CONF_II_PROTO
 614 -#define USTR_CONF_II_PROTO inline
 615 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 616  #include "ustr-set.h"
 617 diff --git a/ustr-split-dbg-code.c b/ustr-split-dbg-code.c
 618 index 03e5ca5..e40d2a5 100644
 619 --- a/ustr-split-dbg-code.c
 620 +++ b/ustr-split-dbg-code.c
 621 @@ -3,11 +3,11 @@
 622  #include "ustr-conf-debug.h"
 623  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 624  #define USTR_CONF_e_PROTO  extern
 625 -#define USTR_CONF_i_PROTO  extern inline
 626 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 627  #define USTR_CONF_E_PROTO  extern
 628 -#define USTR_CONF_I_PROTO  extern inline
 629 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 630  #define USTR_CONF_EI_PROTO extern
 631 -#define USTR_CONF_II_PROTO extern inline
 632 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 633  #include "ustr-main.h"
 634  #include "ustr-set.h"
 635  #include "ustr-spn.h"
 636 @@ -19,5 +19,5 @@
 637  #undef  USTR_CONF_I_PROTO
 638  #define USTR_CONF_I_PROTO
 639  #undef  USTR_CONF_II_PROTO
 640 -#define USTR_CONF_II_PROTO inline
 641 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 642  #include "ustr-split.h"
 643 diff --git a/ustr-split-opt-code.c b/ustr-split-opt-code.c
 644 index d64e300..74f4b1c 100644
 645 --- a/ustr-split-opt-code.c
 646 +++ b/ustr-split-opt-code.c
 647 @@ -3,11 +3,11 @@
 648  #include "ustr-conf.h"
 649  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 650  #define USTR_CONF_e_PROTO  extern
 651 -#define USTR_CONF_i_PROTO  extern inline
 652 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 653  #define USTR_CONF_E_PROTO  extern
 654 -#define USTR_CONF_I_PROTO  extern inline
 655 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 656  #define USTR_CONF_EI_PROTO extern
 657 -#define USTR_CONF_II_PROTO extern inline
 658 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 659  #include "ustr-main.h"
 660  #include "ustr-set.h"
 661  #include "ustr-spn.h"
 662 @@ -19,5 +19,5 @@
 663  #undef  USTR_CONF_I_PROTO
 664  #define USTR_CONF_I_PROTO
 665  #undef  USTR_CONF_II_PROTO
 666 -#define USTR_CONF_II_PROTO inline
 667 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 668  #include "ustr-split.h"
 669 diff --git a/ustr-spn-dbg-code.c b/ustr-spn-dbg-code.c
 670 index ff97432..b0b09d4 100644
 671 --- a/ustr-spn-dbg-code.c
 672 +++ b/ustr-spn-dbg-code.c
 673 @@ -3,11 +3,11 @@
 674  #include "ustr-conf-debug.h"
 675  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 676  #define USTR_CONF_e_PROTO  extern
 677 -#define USTR_CONF_i_PROTO  extern inline
 678 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 679  #define USTR_CONF_E_PROTO  extern
 680 -#define USTR_CONF_I_PROTO  extern inline
 681 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 682  #define USTR_CONF_EI_PROTO extern
 683 -#define USTR_CONF_II_PROTO extern inline
 684 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 685  #include "ustr-main.h"
 686  #include "ustr-srch.h"
 687  #include "ustr-utf8.h"
 688 @@ -18,5 +18,5 @@
 689  #undef  USTR_CONF_I_PROTO
 690  #define USTR_CONF_I_PROTO
 691  #undef  USTR_CONF_II_PROTO
 692 -#define USTR_CONF_II_PROTO inline
 693 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 694  #include "ustr-spn.h"
 695 diff --git a/ustr-spn-opt-code.c b/ustr-spn-opt-code.c
 696 index 3ff0a07..92c5ccc 100644
 697 --- a/ustr-spn-opt-code.c
 698 +++ b/ustr-spn-opt-code.c
 699 @@ -3,11 +3,11 @@
 700  #include "ustr-conf.h"
 701  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 702  #define USTR_CONF_e_PROTO  extern
 703 -#define USTR_CONF_i_PROTO  extern inline
 704 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 705  #define USTR_CONF_E_PROTO  extern
 706 -#define USTR_CONF_I_PROTO  extern inline
 707 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 708  #define USTR_CONF_EI_PROTO extern
 709 -#define USTR_CONF_II_PROTO extern inline
 710 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 711  #include "ustr-main.h"
 712  #include "ustr-srch.h"
 713  #include "ustr-utf8.h"
 714 @@ -18,5 +18,5 @@
 715  #undef  USTR_CONF_I_PROTO
 716  #define USTR_CONF_I_PROTO
 717  #undef  USTR_CONF_II_PROTO
 718 -#define USTR_CONF_II_PROTO inline
 719 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 720  #include "ustr-spn.h"
 721 diff --git a/ustr-srch-dbg-code.c b/ustr-srch-dbg-code.c
 722 index 40e4dbf..0f4da21 100644
 723 --- a/ustr-srch-dbg-code.c
 724 +++ b/ustr-srch-dbg-code.c
 725 @@ -3,11 +3,11 @@
 726  #include "ustr-conf-debug.h"
 727  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 728  #define USTR_CONF_e_PROTO  extern
 729 -#define USTR_CONF_i_PROTO  extern inline
 730 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 731  #define USTR_CONF_E_PROTO  extern
 732 -#define USTR_CONF_I_PROTO  extern inline
 733 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 734  #define USTR_CONF_EI_PROTO extern
 735 -#define USTR_CONF_II_PROTO extern inline
 736 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 737  #include "ustr-main.h"
 738  #include "ustr-cmp-internal.h"
 739  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 740 @@ -17,6 +17,6 @@
 741  #undef  USTR_CONF_I_PROTO
 742  #define USTR_CONF_I_PROTO
 743  #undef  USTR_CONF_II_PROTO
 744 -#define USTR_CONF_II_PROTO inline
 745 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 746  #include "ustr-srch.h"
 747
 748 diff --git a/ustr-srch-opt-code.c b/ustr-srch-opt-code.c
 749 index 635464d..8dde13d 100644
 750 --- a/ustr-srch-opt-code.c
 751 +++ b/ustr-srch-opt-code.c
 752 @@ -3,11 +3,11 @@
 753  #include "ustr-conf.h"
 754  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 755  #define USTR_CONF_e_PROTO  extern
 756 -#define USTR_CONF_i_PROTO  extern inline
 757 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 758  #define USTR_CONF_E_PROTO  extern
 759 -#define USTR_CONF_I_PROTO  extern inline
 760 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 761  #define USTR_CONF_EI_PROTO extern
 762 -#define USTR_CONF_II_PROTO extern inline
 763 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 764  #include "ustr-main.h"
 765  #include "ustr-cmp-internal.h"
 766  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 767 @@ -17,6 +17,6 @@
 768  #undef  USTR_CONF_I_PROTO
 769  #define USTR_CONF_I_PROTO
 770  #undef  USTR_CONF_II_PROTO
 771 -#define USTR_CONF_II_PROTO inline
 772 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 773  #include "ustr-srch.h"
 774
 775 diff --git a/ustr-sub-dbg-code.c b/ustr-sub-dbg-code.c
 776 index f994716..b1712e6 100644
 777 --- a/ustr-sub-dbg-code.c
 778 +++ b/ustr-sub-dbg-code.c
 779 @@ -3,11 +3,11 @@
 780  #include "ustr-conf-debug.h"
 781  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 782  #define USTR_CONF_e_PROTO  extern
 783 -#define USTR_CONF_i_PROTO  extern inline
 784 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 785  #define USTR_CONF_E_PROTO  extern
 786 -#define USTR_CONF_I_PROTO  extern inline
 787 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 788  #define USTR_CONF_EI_PROTO extern
 789 -#define USTR_CONF_II_PROTO extern inline
 790 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 791  #include "ustr-main.h"
 792  #include "ustr-fmt.h"
 793  #include "ustr-ins.h"
 794 @@ -19,5 +19,5 @@
 795  #undef  USTR_CONF_I_PROTO
 796  #define USTR_CONF_I_PROTO
 797  #undef  USTR_CONF_II_PROTO
 798 -#define USTR_CONF_II_PROTO inline
 799 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 800  #include "ustr-sub.h"
 801 diff --git a/ustr-sub-opt-code.c b/ustr-sub-opt-code.c
 802 index 8cdb4eb..91780c7 100644
 803 --- a/ustr-sub-opt-code.c
 804 +++ b/ustr-sub-opt-code.c
 805 @@ -3,11 +3,11 @@
 806  #include "ustr-conf.h"
 807  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 808  #define USTR_CONF_e_PROTO  extern
 809 -#define USTR_CONF_i_PROTO  extern inline
 810 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 811  #define USTR_CONF_E_PROTO  extern
 812 -#define USTR_CONF_I_PROTO  extern inline
 813 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 814  #define USTR_CONF_EI_PROTO extern
 815 -#define USTR_CONF_II_PROTO extern inline
 816 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 817  #include "ustr-main.h"
 818  #include "ustr-fmt.h"
 819  #include "ustr-ins.h"
 820 @@ -19,5 +19,5 @@
 821  #undef  USTR_CONF_I_PROTO
 822  #define USTR_CONF_I_PROTO
 823  #undef  USTR_CONF_II_PROTO
 824 -#define USTR_CONF_II_PROTO inline
 825 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 826  #include "ustr-sub.h"
 827 diff --git a/ustr-utf8-dbg-code.c b/ustr-utf8-dbg-code.c
 828 index 2666fc2..30786e9 100644
 829 --- a/ustr-utf8-dbg-code.c
 830 +++ b/ustr-utf8-dbg-code.c
 831 @@ -3,11 +3,11 @@
 832  #include "ustr-conf-debug.h"
 833  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 834  #define USTR_CONF_e_PROTO  extern
 835 -#define USTR_CONF_i_PROTO  extern inline
 836 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 837  #define USTR_CONF_E_PROTO  extern
 838 -#define USTR_CONF_I_PROTO  extern inline
 839 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 840  #define USTR_CONF_EI_PROTO extern
 841 -#define USTR_CONF_II_PROTO extern inline
 842 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 843  #include "ustr-main.h"
 844  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 845  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 846 @@ -16,5 +16,5 @@
 847  #undef  USTR_CONF_I_PROTO
 848  #define USTR_CONF_I_PROTO
 849  #undef  USTR_CONF_II_PROTO
 850 -#define USTR_CONF_II_PROTO inline
 851 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 852  #include "ustr-utf8.h"
 853 diff --git a/ustr-utf8-opt-code.c b/ustr-utf8-opt-code.c
 854 index 91fa754..abdf4c0 100644
 855 --- a/ustr-utf8-opt-code.c
 856 +++ b/ustr-utf8-opt-code.c
 857 @@ -3,11 +3,11 @@
 858  #include "ustr-conf.h"
 859  #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
 860  #define USTR_CONF_e_PROTO  extern
 861 -#define USTR_CONF_i_PROTO  extern inline
 862 +#define USTR_CONF_i_PROTO  extern  __attribute__ ((gnu_inline)) inline
 863  #define USTR_CONF_E_PROTO  extern
 864 -#define USTR_CONF_I_PROTO  extern inline
 865 +#define USTR_CONF_I_PROTO  extern  __attribute__ ((gnu_inline)) inline
 866  #define USTR_CONF_EI_PROTO extern
 867 -#define USTR_CONF_II_PROTO extern inline
 868 +#define USTR_CONF_II_PROTO extern  __attribute__ ((gnu_inline)) inline
 869  #include "ustr-main.h"
 870  #undef  USTR_CONF_INCLUDE_CODEONLY_HEADERS
 871  #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
 872 @@ -16,5 +16,5 @@
 873  #undef  USTR_CONF_I_PROTO
 874  #define USTR_CONF_I_PROTO
 875  #undef  USTR_CONF_II_PROTO
 876 -#define USTR_CONF_II_PROTO inline
 877 +#define USTR_CONF_II_PROTO  __attribute__ ((gnu_inline)) inline
 878  #include "ustr-utf8.h"
 879 --
 880 tg: (b148fb7..) fixes/gnu-inline (depends on: upstream)