summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-09-08 01:21:17 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2015-09-08 14:03:28 -0400
commitb383d0cbad042c84d40d2c675b0c9608a60f54e2 (patch)
tree8a1189c2a7de9440f565ba752deee4a4cd74892d
parent76cb970ddc76037a30cfea5cde684aa15bf2af69 (diff)
downloadmeta-selinux-b383d0cbad042c84d40d2c675b0c9608a60f54e2.tar.gz
ustr: fix build error with gcc 5
Backport a patch from debian to fix errors as: ustr-main.h:1062: multiple definition of `ustrp_setf_owner' Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-extended/ustr/ustr/ustr-gnu-inline.diff871
-rw-r--r--recipes-extended/ustr/ustr_1.0.4.bb4
2 files changed, 874 insertions, 1 deletions
diff --git a/recipes-extended/ustr/ustr/ustr-gnu-inline.diff b/recipes-extended/ustr/ustr/ustr-gnu-inline.diff
new file mode 100644
index 0000000..7ea0454
--- /dev/null
+++ b/recipes-extended/ustr/ustr/ustr-gnu-inline.diff
@@ -0,0 +1,871 @@
1From: Václav Ovsík <vaclav.ovsik@gmail.com>
2Subject: [PATCH] fixes/gnu-inline
3
4This patch adds `__attribute__ ((gnu_inline))' into prototype macros
5before `inline' to force GNU89 behaviour of inline functions
6in C99 mode.
7See http://www.gnu.org/software/gcc/gcc-5/porting_to.html
8
9Signed-off-by: Václav Ovsík <vaclav.ovsik@gmail.com>
10
11Update it to fix the conflicts with ustr-c99-inline.patch.
12
13Upstream-Status: Backport [debian]
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.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
53diff --git a/ustr-b-dbg-code.c b/ustr-b-dbg-code.c
54index 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"
79diff --git a/ustr-b-opt-code.c b/ustr-b-opt-code.c
80index 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"
105diff --git a/ustr-cmp-dbg-code.c b/ustr-cmp-dbg-code.c
106index 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"
131diff --git a/ustr-cmp-opt-code.c b/ustr-cmp-opt-code.c
132index 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"
157diff --git a/ustr-compiler.h b/ustr-compiler.h
158index 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
170diff --git a/ustr-fmt-dbg-code.c b/ustr-fmt-dbg-code.c
171index 4249bb1..1f147a0 100644
172--- a/ustr-fmt-dbg-code.c
173+++ b/ustr-fmt-dbg-code.c
174@@ -3,11 +3,11 @@
175 #include "ustr-conf-debug.h"
176 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
177 #define USTR_CONF_e_PROTO extern
178-#define USTR_CONF_i_PROTO extern inline
179+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
180 #define USTR_CONF_E_PROTO extern
181-#define USTR_CONF_I_PROTO extern inline
182+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
183 #define USTR_CONF_EI_PROTO extern
184-#define USTR_CONF_II_PROTO extern inline
185+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
186 #include "ustr-main.h"
187 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
188 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
189@@ -16,5 +16,5 @@
190 #undef USTR_CONF_I_PROTO
191 #define USTR_CONF_I_PROTO
192 #undef USTR_CONF_II_PROTO
193-#define USTR_CONF_II_PROTO inline
194+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
195 #include "ustr-fmt.h"
196diff --git a/ustr-fmt-opt-code.c b/ustr-fmt-opt-code.c
197index c73e375..989b29f 100644
198--- a/ustr-fmt-opt-code.c
199+++ b/ustr-fmt-opt-code.c
200@@ -3,11 +3,11 @@
201 #include "ustr-conf.h"
202 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
203 #define USTR_CONF_e_PROTO extern
204-#define USTR_CONF_i_PROTO extern inline
205+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
206 #define USTR_CONF_E_PROTO extern
207-#define USTR_CONF_I_PROTO extern inline
208+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
209 #define USTR_CONF_EI_PROTO extern
210-#define USTR_CONF_II_PROTO extern inline
211+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
212 #include "ustr-main.h"
213 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
214 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
215@@ -16,5 +16,5 @@
216 #undef USTR_CONF_I_PROTO
217 #define USTR_CONF_I_PROTO
218 #undef USTR_CONF_II_PROTO
219-#define USTR_CONF_II_PROTO inline
220+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
221 #include "ustr-fmt.h"
222diff --git a/ustr-ins-dbg-code.c b/ustr-ins-dbg-code.c
223index 39f9bba..4c6d5ea 100644
224--- a/ustr-ins-dbg-code.c
225+++ b/ustr-ins-dbg-code.c
226@@ -3,11 +3,11 @@
227 #include "ustr-conf-debug.h"
228 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
229 #define USTR_CONF_e_PROTO extern
230-#define USTR_CONF_i_PROTO extern inline
231+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
232 #define USTR_CONF_E_PROTO extern
233-#define USTR_CONF_I_PROTO extern inline
234+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
235 #define USTR_CONF_EI_PROTO extern
236-#define USTR_CONF_II_PROTO extern inline
237+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
238 #include "ustr-main.h"
239 #include "ustr-fmt.h"
240 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
241@@ -17,5 +17,5 @@
242 #undef USTR_CONF_I_PROTO
243 #define USTR_CONF_I_PROTO
244 #undef USTR_CONF_II_PROTO
245-#define USTR_CONF_II_PROTO inline
246+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
247 #include "ustr-ins.h"
248diff --git a/ustr-ins-opt-code.c b/ustr-ins-opt-code.c
249index 1aca827..859b44d 100644
250--- a/ustr-ins-opt-code.c
251+++ b/ustr-ins-opt-code.c
252@@ -3,11 +3,11 @@
253 #include "ustr-conf.h"
254 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
255 #define USTR_CONF_e_PROTO extern
256-#define USTR_CONF_i_PROTO extern inline
257+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
258 #define USTR_CONF_E_PROTO extern
259-#define USTR_CONF_I_PROTO extern inline
260+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
261 #define USTR_CONF_EI_PROTO extern
262-#define USTR_CONF_II_PROTO extern inline
263+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
264 #include "ustr-main.h"
265 #include "ustr-fmt.h"
266 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
267@@ -17,5 +17,5 @@
268 #undef USTR_CONF_I_PROTO
269 #define USTR_CONF_I_PROTO
270 #undef USTR_CONF_II_PROTO
271-#define USTR_CONF_II_PROTO inline
272+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
273 #include "ustr-ins.h"
274diff --git a/ustr-io-dbg-code.c b/ustr-io-dbg-code.c
275index c361c93..d42e43f 100644
276--- a/ustr-io-dbg-code.c
277+++ b/ustr-io-dbg-code.c
278@@ -3,11 +3,11 @@
279 #include "ustr-conf-debug.h"
280 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
281 #define USTR_CONF_e_PROTO extern
282-#define USTR_CONF_i_PROTO extern inline
283+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
284 #define USTR_CONF_E_PROTO extern
285-#define USTR_CONF_I_PROTO extern inline
286+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
287 #define USTR_CONF_EI_PROTO extern
288-#define USTR_CONF_II_PROTO extern inline
289+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
290 #include "ustr-main.h"
291 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
292 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
293@@ -16,5 +16,5 @@
294 #undef USTR_CONF_I_PROTO
295 #define USTR_CONF_I_PROTO
296 #undef USTR_CONF_II_PROTO
297-#define USTR_CONF_II_PROTO inline
298+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
299 #include "ustr-io.h"
300diff --git a/ustr-io-opt-code.c b/ustr-io-opt-code.c
301index b1b4525..ae8de87 100644
302--- a/ustr-io-opt-code.c
303+++ b/ustr-io-opt-code.c
304@@ -3,11 +3,11 @@
305 #include "ustr-conf.h"
306 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
307 #define USTR_CONF_e_PROTO extern
308-#define USTR_CONF_i_PROTO extern inline
309+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
310 #define USTR_CONF_E_PROTO extern
311-#define USTR_CONF_I_PROTO extern inline
312+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
313 #define USTR_CONF_EI_PROTO extern
314-#define USTR_CONF_II_PROTO extern inline
315+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
316 #include "ustr-main.h"
317 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
318 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
319@@ -16,5 +16,5 @@
320 #undef USTR_CONF_I_PROTO
321 #define USTR_CONF_I_PROTO
322 #undef USTR_CONF_II_PROTO
323-#define USTR_CONF_II_PROTO inline
324+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
325 #include "ustr-io.h"
326diff --git a/ustr-main-dbg-code.c b/ustr-main-dbg-code.c
327index 4b821ce..abaa53a 100644
328--- a/ustr-main-dbg-code.c
329+++ b/ustr-main-dbg-code.c
330@@ -7,5 +7,5 @@
331 #define USTR_CONF_E_PROTO extern
332 #define USTR_CONF_I_PROTO
333 #define USTR_CONF_EI_PROTO extern
334-#define USTR_CONF_II_PROTO inline
335+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
336 #include "ustr-main.h"
337diff --git a/ustr-main-opt-code.c b/ustr-main-opt-code.c
338index 233fb60..7ef6e98 100644
339--- a/ustr-main-opt-code.c
340+++ b/ustr-main-opt-code.c
341@@ -7,5 +7,5 @@
342 #define USTR_CONF_E_PROTO extern
343 #define USTR_CONF_I_PROTO
344 #define USTR_CONF_EI_PROTO extern
345-#define USTR_CONF_II_PROTO inline
346+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
347 #include "ustr-main.h"
348diff --git a/ustr-parse-dbg-code.c b/ustr-parse-dbg-code.c
349index c9653af..6e1707d 100644
350--- a/ustr-parse-dbg-code.c
351+++ b/ustr-parse-dbg-code.c
352@@ -3,11 +3,11 @@
353 #include "ustr-conf-debug.h"
354 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
355 #define USTR_CONF_e_PROTO extern
356-#define USTR_CONF_i_PROTO extern inline
357+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
358 #define USTR_CONF_E_PROTO extern
359-#define USTR_CONF_I_PROTO extern inline
360+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
361 #define USTR_CONF_EI_PROTO extern
362-#define USTR_CONF_II_PROTO extern inline
363+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
364 #include "ustr-main.h"
365 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
366 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
367@@ -16,5 +16,5 @@
368 #undef USTR_CONF_I_PROTO
369 #define USTR_CONF_I_PROTO
370 #undef USTR_CONF_II_PROTO
371-#define USTR_CONF_II_PROTO inline
372+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
373 #include "ustr-parse.h"
374diff --git a/ustr-parse-opt-code.c b/ustr-parse-opt-code.c
375index 0c8df4d..fc96db2 100644
376--- a/ustr-parse-opt-code.c
377+++ b/ustr-parse-opt-code.c
378@@ -3,11 +3,11 @@
379 #include "ustr-conf.h"
380 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
381 #define USTR_CONF_e_PROTO extern
382-#define USTR_CONF_i_PROTO extern inline
383+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
384 #define USTR_CONF_E_PROTO extern
385-#define USTR_CONF_I_PROTO extern inline
386+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
387 #define USTR_CONF_EI_PROTO extern
388-#define USTR_CONF_II_PROTO extern inline
389+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
390 #include "ustr-main.h"
391 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
392 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
393@@ -16,5 +16,5 @@
394 #undef USTR_CONF_I_PROTO
395 #define USTR_CONF_I_PROTO
396 #undef USTR_CONF_II_PROTO
397-#define USTR_CONF_II_PROTO inline
398+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
399 #include "ustr-parse.h"
400diff --git a/ustr-pool-dbg-code.c b/ustr-pool-dbg-code.c
401index adf7519..957f9ca 100644
402--- a/ustr-pool-dbg-code.c
403+++ b/ustr-pool-dbg-code.c
404@@ -3,11 +3,11 @@
405 #include "ustr-conf-debug.h"
406 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
407 #define USTR_CONF_e_PROTO extern
408-#define USTR_CONF_i_PROTO extern inline
409+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
410 #define USTR_CONF_E_PROTO extern
411-#define USTR_CONF_I_PROTO extern inline
412+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
413 #define USTR_CONF_EI_PROTO extern
414-#define USTR_CONF_II_PROTO extern inline
415+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
416 #include "ustr-main.h"
417 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
418 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
419@@ -16,5 +16,5 @@
420 #undef USTR_CONF_I_PROTO
421 #define USTR_CONF_I_PROTO
422 #undef USTR_CONF_II_PROTO
423-#define USTR_CONF_II_PROTO inline
424+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
425 #include "ustr-pool.h"
426diff --git a/ustr-pool-opt-code.c b/ustr-pool-opt-code.c
427index 2b0367c..c1b2413 100644
428--- a/ustr-pool-opt-code.c
429+++ b/ustr-pool-opt-code.c
430@@ -3,11 +3,11 @@
431 #include "ustr-conf.h"
432 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
433 #define USTR_CONF_e_PROTO extern
434-#define USTR_CONF_i_PROTO extern inline
435+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
436 #define USTR_CONF_E_PROTO extern
437-#define USTR_CONF_I_PROTO extern inline
438+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
439 #define USTR_CONF_EI_PROTO extern
440-#define USTR_CONF_II_PROTO extern inline
441+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
442 #include "ustr-main.h"
443 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
444 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
445@@ -16,5 +16,5 @@
446 #undef USTR_CONF_I_PROTO
447 #define USTR_CONF_I_PROTO
448 #undef USTR_CONF_II_PROTO
449-#define USTR_CONF_II_PROTO inline
450+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
451 #include "ustr-pool.h"
452diff --git a/ustr-replace-dbg-code.c b/ustr-replace-dbg-code.c
453index fe02187..90531ac 100644
454--- a/ustr-replace-dbg-code.c
455+++ b/ustr-replace-dbg-code.c
456@@ -3,11 +3,11 @@
457 #include "ustr-conf-debug.h"
458 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
459 #define USTR_CONF_e_PROTO extern
460-#define USTR_CONF_i_PROTO extern inline
461+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
462 #define USTR_CONF_E_PROTO extern
463-#define USTR_CONF_I_PROTO extern inline
464+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
465 #define USTR_CONF_EI_PROTO extern
466-#define USTR_CONF_II_PROTO extern inline
467+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
468 #include "ustr-main.h"
469 #include "ustr-set.h"
470 #include "ustr-srch.h"
471@@ -19,5 +19,5 @@
472 #undef USTR_CONF_I_PROTO
473 #define USTR_CONF_I_PROTO
474 #undef USTR_CONF_II_PROTO
475-#define USTR_CONF_II_PROTO inline
476+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
477 #include "ustr-replace.h"
478diff --git a/ustr-replace-opt-code.c b/ustr-replace-opt-code.c
479index e76b3bb..6232753 100644
480--- a/ustr-replace-opt-code.c
481+++ b/ustr-replace-opt-code.c
482@@ -3,11 +3,11 @@
483 #include "ustr-conf.h"
484 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
485 #define USTR_CONF_e_PROTO extern
486-#define USTR_CONF_i_PROTO extern inline
487+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
488 #define USTR_CONF_E_PROTO extern
489-#define USTR_CONF_I_PROTO extern inline
490+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
491 #define USTR_CONF_EI_PROTO extern
492-#define USTR_CONF_II_PROTO extern inline
493+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
494 #include "ustr-main.h"
495 #include "ustr-set.h"
496 #include "ustr-srch.h"
497@@ -19,5 +19,5 @@
498 #undef USTR_CONF_I_PROTO
499 #define USTR_CONF_I_PROTO
500 #undef USTR_CONF_II_PROTO
501-#define USTR_CONF_II_PROTO inline
502+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
503 #include "ustr-replace.h"
504diff --git a/ustr-sc-dbg-code.c b/ustr-sc-dbg-code.c
505index 0011c63..d7ce317 100644
506--- a/ustr-sc-dbg-code.c
507+++ b/ustr-sc-dbg-code.c
508@@ -3,11 +3,11 @@
509 #include "ustr-conf-debug.h"
510 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
511 #define USTR_CONF_e_PROTO extern
512-#define USTR_CONF_i_PROTO extern inline
513+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
514 #define USTR_CONF_E_PROTO extern
515-#define USTR_CONF_I_PROTO extern inline
516+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
517 #define USTR_CONF_EI_PROTO extern
518-#define USTR_CONF_II_PROTO extern inline
519+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
520 #include "ustr-main.h"
521 #include "ustr-spn.h"
522 #include "ustr-utf8.h"
523@@ -18,5 +18,5 @@
524 #undef USTR_CONF_I_PROTO
525 #define USTR_CONF_I_PROTO
526 #undef USTR_CONF_II_PROTO
527-#define USTR_CONF_II_PROTO inline
528+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
529 #include "ustr-sc.h"
530diff --git a/ustr-sc-opt-code.c b/ustr-sc-opt-code.c
531index 7cb81ba..4a97ed9 100644
532--- a/ustr-sc-opt-code.c
533+++ b/ustr-sc-opt-code.c
534@@ -3,11 +3,11 @@
535 #include "ustr-conf.h"
536 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
537 #define USTR_CONF_e_PROTO extern
538-#define USTR_CONF_i_PROTO extern inline
539+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
540 #define USTR_CONF_E_PROTO extern
541-#define USTR_CONF_I_PROTO extern inline
542+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
543 #define USTR_CONF_EI_PROTO extern
544-#define USTR_CONF_II_PROTO extern inline
545+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
546 #include "ustr-main.h"
547 #include "ustr-spn.h"
548 #include "ustr-utf8.h"
549@@ -18,5 +18,5 @@
550 #undef USTR_CONF_I_PROTO
551 #define USTR_CONF_I_PROTO
552 #undef USTR_CONF_II_PROTO
553-#define USTR_CONF_II_PROTO inline
554+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
555 #include "ustr-sc.h"
556diff --git a/ustr-set-dbg-code.c b/ustr-set-dbg-code.c
557index 023875a..cf77071 100644
558--- a/ustr-set-dbg-code.c
559+++ b/ustr-set-dbg-code.c
560@@ -3,11 +3,11 @@
561 #include "ustr-conf-debug.h"
562 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
563 #define USTR_CONF_e_PROTO extern
564-#define USTR_CONF_i_PROTO extern inline
565+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
566 #define USTR_CONF_E_PROTO extern
567-#define USTR_CONF_I_PROTO extern inline
568+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
569 #define USTR_CONF_EI_PROTO extern
570-#define USTR_CONF_II_PROTO extern inline
571+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
572 #include "ustr-main.h"
573 #include "ustr-fmt.h"
574 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
575@@ -17,5 +17,5 @@
576 #undef USTR_CONF_I_PROTO
577 #define USTR_CONF_I_PROTO
578 #undef USTR_CONF_II_PROTO
579-#define USTR_CONF_II_PROTO inline
580+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
581 #include "ustr-set.h"
582diff --git a/ustr-set-opt-code.c b/ustr-set-opt-code.c
583index e726888..34dcaf6 100644
584--- a/ustr-set-opt-code.c
585+++ b/ustr-set-opt-code.c
586@@ -3,11 +3,11 @@
587 #include "ustr-conf.h"
588 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
589 #define USTR_CONF_e_PROTO extern
590-#define USTR_CONF_i_PROTO extern inline
591+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
592 #define USTR_CONF_E_PROTO extern
593-#define USTR_CONF_I_PROTO extern inline
594+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
595 #define USTR_CONF_EI_PROTO extern
596-#define USTR_CONF_II_PROTO extern inline
597+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
598 #include "ustr-main.h"
599 #include "ustr-fmt.h"
600 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
601@@ -17,5 +17,5 @@
602 #undef USTR_CONF_I_PROTO
603 #define USTR_CONF_I_PROTO
604 #undef USTR_CONF_II_PROTO
605-#define USTR_CONF_II_PROTO inline
606+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
607 #include "ustr-set.h"
608diff --git a/ustr-split-dbg-code.c b/ustr-split-dbg-code.c
609index 03e5ca5..e40d2a5 100644
610--- a/ustr-split-dbg-code.c
611+++ b/ustr-split-dbg-code.c
612@@ -3,11 +3,11 @@
613 #include "ustr-conf-debug.h"
614 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
615 #define USTR_CONF_e_PROTO extern
616-#define USTR_CONF_i_PROTO extern inline
617+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
618 #define USTR_CONF_E_PROTO extern
619-#define USTR_CONF_I_PROTO extern inline
620+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
621 #define USTR_CONF_EI_PROTO extern
622-#define USTR_CONF_II_PROTO extern inline
623+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
624 #include "ustr-main.h"
625 #include "ustr-set.h"
626 #include "ustr-spn.h"
627@@ -19,5 +19,5 @@
628 #undef USTR_CONF_I_PROTO
629 #define USTR_CONF_I_PROTO
630 #undef USTR_CONF_II_PROTO
631-#define USTR_CONF_II_PROTO inline
632+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
633 #include "ustr-split.h"
634diff --git a/ustr-split-opt-code.c b/ustr-split-opt-code.c
635index d64e300..74f4b1c 100644
636--- a/ustr-split-opt-code.c
637+++ b/ustr-split-opt-code.c
638@@ -3,11 +3,11 @@
639 #include "ustr-conf.h"
640 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
641 #define USTR_CONF_e_PROTO extern
642-#define USTR_CONF_i_PROTO extern inline
643+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
644 #define USTR_CONF_E_PROTO extern
645-#define USTR_CONF_I_PROTO extern inline
646+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
647 #define USTR_CONF_EI_PROTO extern
648-#define USTR_CONF_II_PROTO extern inline
649+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
650 #include "ustr-main.h"
651 #include "ustr-set.h"
652 #include "ustr-spn.h"
653@@ -19,5 +19,5 @@
654 #undef USTR_CONF_I_PROTO
655 #define USTR_CONF_I_PROTO
656 #undef USTR_CONF_II_PROTO
657-#define USTR_CONF_II_PROTO inline
658+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
659 #include "ustr-split.h"
660diff --git a/ustr-spn-dbg-code.c b/ustr-spn-dbg-code.c
661index ff97432..b0b09d4 100644
662--- a/ustr-spn-dbg-code.c
663+++ b/ustr-spn-dbg-code.c
664@@ -3,11 +3,11 @@
665 #include "ustr-conf-debug.h"
666 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
667 #define USTR_CONF_e_PROTO extern
668-#define USTR_CONF_i_PROTO extern inline
669+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
670 #define USTR_CONF_E_PROTO extern
671-#define USTR_CONF_I_PROTO extern inline
672+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
673 #define USTR_CONF_EI_PROTO extern
674-#define USTR_CONF_II_PROTO extern inline
675+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
676 #include "ustr-main.h"
677 #include "ustr-srch.h"
678 #include "ustr-utf8.h"
679@@ -18,5 +18,5 @@
680 #undef USTR_CONF_I_PROTO
681 #define USTR_CONF_I_PROTO
682 #undef USTR_CONF_II_PROTO
683-#define USTR_CONF_II_PROTO inline
684+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
685 #include "ustr-spn.h"
686diff --git a/ustr-spn-opt-code.c b/ustr-spn-opt-code.c
687index 3ff0a07..92c5ccc 100644
688--- a/ustr-spn-opt-code.c
689+++ b/ustr-spn-opt-code.c
690@@ -3,11 +3,11 @@
691 #include "ustr-conf.h"
692 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
693 #define USTR_CONF_e_PROTO extern
694-#define USTR_CONF_i_PROTO extern inline
695+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
696 #define USTR_CONF_E_PROTO extern
697-#define USTR_CONF_I_PROTO extern inline
698+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
699 #define USTR_CONF_EI_PROTO extern
700-#define USTR_CONF_II_PROTO extern inline
701+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
702 #include "ustr-main.h"
703 #include "ustr-srch.h"
704 #include "ustr-utf8.h"
705@@ -18,5 +18,5 @@
706 #undef USTR_CONF_I_PROTO
707 #define USTR_CONF_I_PROTO
708 #undef USTR_CONF_II_PROTO
709-#define USTR_CONF_II_PROTO inline
710+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
711 #include "ustr-spn.h"
712diff --git a/ustr-srch-dbg-code.c b/ustr-srch-dbg-code.c
713index 40e4dbf..0f4da21 100644
714--- a/ustr-srch-dbg-code.c
715+++ b/ustr-srch-dbg-code.c
716@@ -3,11 +3,11 @@
717 #include "ustr-conf-debug.h"
718 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
719 #define USTR_CONF_e_PROTO extern
720-#define USTR_CONF_i_PROTO extern inline
721+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
722 #define USTR_CONF_E_PROTO extern
723-#define USTR_CONF_I_PROTO extern inline
724+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
725 #define USTR_CONF_EI_PROTO extern
726-#define USTR_CONF_II_PROTO extern inline
727+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
728 #include "ustr-main.h"
729 #include "ustr-cmp-internal.h"
730 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
731@@ -17,6 +17,6 @@
732 #undef USTR_CONF_I_PROTO
733 #define USTR_CONF_I_PROTO
734 #undef USTR_CONF_II_PROTO
735-#define USTR_CONF_II_PROTO inline
736+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
737 #include "ustr-srch.h"
738
739diff --git a/ustr-srch-opt-code.c b/ustr-srch-opt-code.c
740index 635464d..8dde13d 100644
741--- a/ustr-srch-opt-code.c
742+++ b/ustr-srch-opt-code.c
743@@ -3,11 +3,11 @@
744 #include "ustr-conf.h"
745 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
746 #define USTR_CONF_e_PROTO extern
747-#define USTR_CONF_i_PROTO extern inline
748+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
749 #define USTR_CONF_E_PROTO extern
750-#define USTR_CONF_I_PROTO extern inline
751+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
752 #define USTR_CONF_EI_PROTO extern
753-#define USTR_CONF_II_PROTO extern inline
754+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
755 #include "ustr-main.h"
756 #include "ustr-cmp-internal.h"
757 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
758@@ -17,6 +17,6 @@
759 #undef USTR_CONF_I_PROTO
760 #define USTR_CONF_I_PROTO
761 #undef USTR_CONF_II_PROTO
762-#define USTR_CONF_II_PROTO inline
763+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
764 #include "ustr-srch.h"
765
766diff --git a/ustr-sub-dbg-code.c b/ustr-sub-dbg-code.c
767index f994716..b1712e6 100644
768--- a/ustr-sub-dbg-code.c
769+++ b/ustr-sub-dbg-code.c
770@@ -3,11 +3,11 @@
771 #include "ustr-conf-debug.h"
772 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
773 #define USTR_CONF_e_PROTO extern
774-#define USTR_CONF_i_PROTO extern inline
775+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
776 #define USTR_CONF_E_PROTO extern
777-#define USTR_CONF_I_PROTO extern inline
778+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
779 #define USTR_CONF_EI_PROTO extern
780-#define USTR_CONF_II_PROTO extern inline
781+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
782 #include "ustr-main.h"
783 #include "ustr-fmt.h"
784 #include "ustr-ins.h"
785@@ -19,5 +19,5 @@
786 #undef USTR_CONF_I_PROTO
787 #define USTR_CONF_I_PROTO
788 #undef USTR_CONF_II_PROTO
789-#define USTR_CONF_II_PROTO inline
790+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
791 #include "ustr-sub.h"
792diff --git a/ustr-sub-opt-code.c b/ustr-sub-opt-code.c
793index 8cdb4eb..91780c7 100644
794--- a/ustr-sub-opt-code.c
795+++ b/ustr-sub-opt-code.c
796@@ -3,11 +3,11 @@
797 #include "ustr-conf.h"
798 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
799 #define USTR_CONF_e_PROTO extern
800-#define USTR_CONF_i_PROTO extern inline
801+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
802 #define USTR_CONF_E_PROTO extern
803-#define USTR_CONF_I_PROTO extern inline
804+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
805 #define USTR_CONF_EI_PROTO extern
806-#define USTR_CONF_II_PROTO extern inline
807+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
808 #include "ustr-main.h"
809 #include "ustr-fmt.h"
810 #include "ustr-ins.h"
811@@ -19,5 +19,5 @@
812 #undef USTR_CONF_I_PROTO
813 #define USTR_CONF_I_PROTO
814 #undef USTR_CONF_II_PROTO
815-#define USTR_CONF_II_PROTO inline
816+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
817 #include "ustr-sub.h"
818diff --git a/ustr-utf8-dbg-code.c b/ustr-utf8-dbg-code.c
819index 2666fc2..30786e9 100644
820--- a/ustr-utf8-dbg-code.c
821+++ b/ustr-utf8-dbg-code.c
822@@ -3,11 +3,11 @@
823 #include "ustr-conf-debug.h"
824 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
825 #define USTR_CONF_e_PROTO extern
826-#define USTR_CONF_i_PROTO extern inline
827+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
828 #define USTR_CONF_E_PROTO extern
829-#define USTR_CONF_I_PROTO extern inline
830+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
831 #define USTR_CONF_EI_PROTO extern
832-#define USTR_CONF_II_PROTO extern inline
833+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
834 #include "ustr-main.h"
835 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
836 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
837@@ -16,5 +16,5 @@
838 #undef USTR_CONF_I_PROTO
839 #define USTR_CONF_I_PROTO
840 #undef USTR_CONF_II_PROTO
841-#define USTR_CONF_II_PROTO inline
842+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
843 #include "ustr-utf8.h"
844diff --git a/ustr-utf8-opt-code.c b/ustr-utf8-opt-code.c
845index 91fa754..abdf4c0 100644
846--- a/ustr-utf8-opt-code.c
847+++ b/ustr-utf8-opt-code.c
848@@ -3,11 +3,11 @@
849 #include "ustr-conf.h"
850 #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
851 #define USTR_CONF_e_PROTO extern
852-#define USTR_CONF_i_PROTO extern inline
853+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
854 #define USTR_CONF_E_PROTO extern
855-#define USTR_CONF_I_PROTO extern inline
856+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
857 #define USTR_CONF_EI_PROTO extern
858-#define USTR_CONF_II_PROTO extern inline
859+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
860 #include "ustr-main.h"
861 #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
862 #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
863@@ -16,5 +16,5 @@
864 #undef USTR_CONF_I_PROTO
865 #define USTR_CONF_I_PROTO
866 #undef USTR_CONF_II_PROTO
867-#define USTR_CONF_II_PROTO inline
868+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
869 #include "ustr-utf8.h"
870--
871tg: (b148fb7..) fixes/gnu-inline (depends on: upstream)
diff --git a/recipes-extended/ustr/ustr_1.0.4.bb b/recipes-extended/ustr/ustr_1.0.4.bb
index cdb78ad..c34799b 100644
--- a/recipes-extended/ustr/ustr_1.0.4.bb
+++ b/recipes-extended/ustr/ustr_1.0.4.bb
@@ -15,7 +15,9 @@ SRC_URI = "\
15 http://www.and.org/ustr/${PV}/${BPN}-${PV}.tar.bz2 \ 15 http://www.and.org/ustr/${PV}/${BPN}-${PV}.tar.bz2 \
16 file://ustr-makefile-fix.patch;patch=1 \ 16 file://ustr-makefile-fix.patch;patch=1 \
17 file://ustr-fix__va_copy-not-defined.patch;patch=2 \ 17 file://ustr-fix__va_copy-not-defined.patch;patch=2 \
18 file://ustr-c99-inline.patch;patch=3" 18 file://ustr-c99-inline.patch;patch=3 \
19 file://ustr-gnu-inline.diff;patch=4 \
20"
19SRC_URI[md5sum] = "93147d9f0c9765d4cd0f04f7e44bdfce" 21SRC_URI[md5sum] = "93147d9f0c9765d4cd0f04f7e44bdfce"
20SRC_URI[sha256sum] = "3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4" 22SRC_URI[sha256sum] = "3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4"
21 23