aboutsummaryrefslogtreecommitdiffstats
path: root/community/irssi-xmpp/musl-fixes.patch
blob: e51c4efbb38d5091cb6f90243a8bf7d47e0a0f82 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
Only in b/src/core: libxmpp_core.so
diff -rBu a/src/core/loudmouth-tools.h b/src/core/loudmouth-tools.h
--- a/src/core/loudmouth-tools.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/loudmouth-tools.h	2016-06-07 14:54:04.037983586 +0200
@@ -1,9 +1,13 @@
 #ifndef __LOUDMOUTH_TOOLS_H
 #define __LOUDMOUTH_TOOLS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 LmMessageNode	*lm_find_node(LmMessageNode *, const char *,
 		     const char *, const char *);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: loudmouth-tools.o
diff -rBu a/src/core/protocol.h b/src/core/protocol.h
--- a/src/core/protocol.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/protocol.h	2016-06-07 14:57:43.995854903 +0200
@@ -3,9 +3,13 @@
 
 #include "xmpp-servers.h"
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void	protocol_init(void);
 void	protocol_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: protocol.o
diff -rBu a/src/core/rosters-tools.h b/src/core/rosters-tools.h
--- a/src/core/rosters-tools.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/rosters-tools.h	2016-06-07 14:56:35.477774630 +0200
@@ -3,7 +3,9 @@
 
 #include "rosters.h"
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 XMPP_ROSTER_USER_REC	 *rosters_find_user(GSList *, const char *,
 			     XMPP_ROSTER_GROUP_REC **,
 			     XMPP_ROSTER_RESOURCE_REC **);
@@ -12,6 +14,8 @@
 char		*rosters_resolve_name(XMPP_SERVER_REC *, const char *);
 char		*rosters_get_name(XMPP_SERVER_REC *, const char *);
 int		 xmpp_get_show(const char *);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: rosters-tools.o
diff -rBu a/src/core/rosters.h b/src/core/rosters.h
--- a/src/core/rosters.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/rosters.h	2016-06-07 14:56:12.660637219 +0200
@@ -45,9 +45,13 @@
 	GSList	*users;
 } XMPP_ROSTER_GROUP_REC;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void rosters_init(void);
 void rosters_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: rosters.o
diff -rBu a/src/core/stanzas.h b/src/core/stanzas.h
--- a/src/core/stanzas.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/stanzas.h	2016-06-07 14:57:07.251763497 +0200
@@ -1,9 +1,13 @@
 #ifndef __STANZAS_H
 #define __STANZAS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void	stanzas_init(void);
 void	stanzas_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: stanzas.o
diff -rBu a/src/core/tools.h b/src/core/tools.h
--- a/src/core/tools.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/tools.h	2016-06-07 14:58:25.420042865 +0200
@@ -1,7 +1,9 @@
 #ifndef __TOOLS_H
 #define __TOOLS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 char	*xmpp_recode_out(const char *);
 char	*xmpp_recode_in(const char *);
 
@@ -15,6 +17,8 @@
 gboolean xmpp_priority_out_of_bound(const int);
 gboolean xmpp_presence_changed(const int, const int, const char *,
 	     const char *, const int, const int);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: tools.o
diff -rBu a/src/core/xep/chatstates.h b/src/core/xep/chatstates.h
--- a/src/core/xep/chatstates.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/chatstates.h	2016-06-07 15:02:41.755331358 +0200
@@ -1,9 +1,13 @@
 #ifndef __CHATSTATES_H
 #define __CHATSTATES_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void chatstates_init(void);
 void chatstates_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: chatstates.o
diff -rBu a/src/core/xep/composing.h b/src/core/xep/composing.h
--- a/src/core/xep/composing.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/composing.h	2016-06-07 15:03:01.002395114 +0200
@@ -1,9 +1,13 @@
 #ifndef __COMPOSING_H
 #define __COMPOSING_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void composing_init(void);
 void composing_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: composing.o
diff -rBu a/src/core/xep/datetime.h b/src/core/xep/datetime.h
--- a/src/core/xep/datetime.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/datetime.h	2016-06-07 15:00:12.732256841 +0200
@@ -1,8 +1,12 @@
 #ifndef __DATETIME_H
 #define __DATETIME_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 time_t xep82_datetime(const char *);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: datetime.o
diff -rBu a/src/core/xep/delay.h b/src/core/xep/delay.h
--- a/src/core/xep/delay.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/delay.h	2016-06-07 15:03:17.059393056 +0200
@@ -1,9 +1,13 @@
 #ifndef __DELAY_H
 #define __DELAY_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void delay_init(void);
 void delay_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: delay.o
diff -rBu a/src/core/xep/disco.h b/src/core/xep/disco.h
--- a/src/core/xep/disco.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/disco.h	2016-06-07 14:59:18.157797573 +0200
@@ -1,14 +1,18 @@
 #ifndef __DISCO_H
 #define __DISCO_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void		disco_add_feature(char *);
 gboolean	disco_have_feature(GSList *, const char *);
 void		disco_request(XMPP_SERVER_REC *, const char *);
 
 void disco_init(void);
 void disco_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #define XMLNS "xmlns"
 
Only in b/src/core/xep: disco.o
diff -rBu a/src/core/xep/muc-commands.h b/src/core/xep/muc-commands.h
--- a/src/core/xep/muc-commands.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/muc-commands.h	2016-06-07 15:01:19.090292550 +0200
@@ -1,9 +1,13 @@
 #ifndef __MUC_COMMANDS_H
 #define __MUC_COMMANDS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void muc_commands_init(void);
 void muc_commands_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: muc-commands.o
diff -rBu a/src/core/xep/muc-events.h b/src/core/xep/muc-events.h
--- a/src/core/xep/muc-events.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/muc-events.h	2016-06-07 15:01:42.187435738 +0200
@@ -1,9 +1,13 @@
 #ifndef __MUC_EVENTS_H
 #define __MUC_EVENTS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void muc_events_init(void);
 void muc_events_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: muc-events.o
diff -rBu a/src/core/xep/muc-nicklist.h b/src/core/xep/muc-nicklist.h
--- a/src/core/xep/muc-nicklist.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/muc-nicklist.h	2016-06-07 15:01:00.156568592 +0200
@@ -41,7 +41,9 @@
 };
 extern const char *xmpp_nicklist_role[];
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 XMPP_NICK_REC	*xmpp_nicklist_insert(MUC_REC *, const char *, const char *);
 void		 xmpp_nicklist_rename(MUC_REC *, XMPP_NICK_REC *, const char *,
 		     const char *);
@@ -54,6 +56,8 @@
 
 void muc_nicklist_init(void);
 void muc_nicklist_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: muc-nicklist.o
diff -rBu a/src/core/xep/muc-reconnect.h b/src/core/xep/muc-reconnect.h
--- a/src/core/xep/muc-reconnect.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/muc-reconnect.h	2016-06-07 15:02:20.434891494 +0200
@@ -1,9 +1,13 @@
 #ifndef __MUC_RECONNECT_H
 #define __MUC_RECONNECT_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void muc_reconnect_init(void);
 void muc_reconnect_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: muc-reconnect.o
diff -rBu a/src/core/xep/muc.h b/src/core/xep/muc.h
--- a/src/core/xep/muc.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/muc.h	2016-06-07 15:00:42.002860727 +0200
@@ -49,7 +49,9 @@
 	MUC_ERROR_MAXIMUM_USERS_REACHED		= 503,
 };
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void muc_join(XMPP_SERVER_REC *, const char *, gboolean);
 void muc_part(MUC_REC *, const char *);
 void muc_nick(MUC_REC *, const char *);
@@ -57,6 +59,8 @@
 
 void muc_init(void);
 void muc_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: muc.o
diff -rBu a/src/core/xep/oob.h b/src/core/xep/oob.h
--- a/src/core/xep/oob.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/oob.h	2016-06-07 15:03:31.993034487 +0200
@@ -1,9 +1,13 @@
 #ifndef __OOB_H
 #define __OOB_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void oob_init(void);
 void oob_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: oob.o
diff -rBu a/src/core/xep/ping.h b/src/core/xep/ping.h
--- a/src/core/xep/ping.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/ping.h	2016-06-07 15:04:08.993797855 +0200
@@ -1,11 +1,15 @@
 #ifndef __PING_H
 #define __PING_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void xmpp_ping_send(XMPP_SERVER_REC *, const char *);
 
 void ping_init(void);
 void ping_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: ping.o
diff -rBu a/src/core/xep/registration.h b/src/core/xep/registration.h
--- a/src/core/xep/registration.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/registration.h	2016-06-07 15:02:03.267870651 +0200
@@ -14,9 +14,13 @@
 	REGISTRATION_ERROR_UNKNOWN		= -1,
 };
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void registration_init(void);
 void registration_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: registration.o
diff -rBu a/src/core/xep/tool_datalist.h b/src/core/xep/tool_datalist.h
--- a/src/core/xep/tool_datalist.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/tool_datalist.h	2016-06-07 14:58:54.853983455 +0200
@@ -14,7 +14,9 @@
 	void (*freedata_func)(DATALIST_REC *);
 } DATALIST;
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 DATALIST	*datalist_new(void (*)(DATALIST_REC *));
 void		 datalist_destroy(DATALIST *);
 DATALIST_REC	*datalist_find(DATALIST *, XMPP_SERVER_REC *, const char *);
@@ -23,6 +25,8 @@
 void		 datalist_free(DATALIST *, DATALIST_REC *);
 void		 datalist_remove(DATALIST *, XMPP_SERVER_REC *, const char *);
 void		 datalist_cleanup(DATALIST *, XMPP_SERVER_REC *);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: tool_datalist.o
diff -rBu a/src/core/xep/vcard.h b/src/core/xep/vcard.h
--- a/src/core/xep/vcard.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/vcard.h	2016-06-07 15:03:52.770129809 +0200
@@ -1,9 +1,13 @@
 #ifndef __VCARD_H
 #define __VCARD_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void vcard_init(void);
 void vcard_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: vcard.o
diff -rBu a/src/core/xep/version.h b/src/core/xep/version.h
--- a/src/core/xep/version.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/version.h	2016-06-07 15:04:23.914105679 +0200
@@ -1,9 +1,13 @@
 #ifndef __VERSION_H
 #define __VERSION_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void version_init(void);
 void version_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: version.o
diff -rBu a/src/core/xep/xep.h b/src/core/xep/xep.h
--- a/src/core/xep/xep.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xep/xep.h	2016-06-07 14:58:04.412942798 +0200
@@ -1,9 +1,13 @@
 #ifndef __XEP_H
 #define __XEP_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void	xep_init(void);
 void	xep_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core/xep: xep.o
diff -rBu a/src/core/xmpp-commands.h b/src/core/xmpp-commands.h
--- a/src/core/xmpp-commands.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xmpp-commands.h	2016-06-07 14:53:34.130699897 +0200
@@ -50,11 +50,15 @@
 		}							\
 	} G_STMT_END
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 char	*xmpp_get_dest(const char *, XMPP_SERVER_REC *, WI_ITEM_REC *);
 
 void	xmpp_commands_init(void);
 void	xmpp_commands_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: xmpp-commands.o
Only in b/src/core: xmpp-core.o
diff -rBu a/src/core/xmpp-queries.h b/src/core/xmpp-queries.h
--- a/src/core/xmpp-queries.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xmpp-queries.h	2016-06-07 14:55:00.702485973 +0200
@@ -22,8 +22,12 @@
 	gboolean	composing_visible;
 };
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 QUERY_REC	*xmpp_query_create(const char *, const char *, int);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: xmpp-queries.o
diff -rBu a/src/core/xmpp-servers-reconnect.h b/src/core/xmpp-servers-reconnect.h
--- a/src/core/xmpp-servers-reconnect.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xmpp-servers-reconnect.h	2016-06-07 14:55:26.259679914 +0200
@@ -1,9 +1,13 @@
 #ifndef __XMPP_SERVERS_RECONNECT_H
 #define __XMPP_SERVERS_RECONNECT_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void	xmpp_servers_reconnect_init(void);
 void	xmpp_servers_reconnect_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: xmpp-servers-reconnect.o
diff -rBu a/src/core/xmpp-servers.h b/src/core/xmpp-servers.h
--- a/src/core/xmpp-servers.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xmpp-servers.h	2016-06-07 14:54:39.542049408 +0200
@@ -54,12 +54,16 @@
 	GSList		*msg_handlers;
 };
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 SERVER_REC	*xmpp_server_init_connect(SERVER_CONNECT_REC *);
 void		 xmpp_server_connect(XMPP_SERVER_REC *);
 
 void        	xmpp_servers_init(void);
 void		xmpp_servers_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: xmpp-servers.o
diff -rBu a/src/core/xmpp-settings.h b/src/core/xmpp-settings.h
--- a/src/core/xmpp-settings.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/core/xmpp-settings.h	2016-06-07 14:55:48.160131745 +0200
@@ -1,9 +1,13 @@
 #ifndef __XMPP_SETTINGS_H
 #define __XMPP_SETTINGS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void xmpp_settings_init(void);
 void xmpp_settings_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/core: xmpp-settings.o
diff -rBu a/src/fe-common/fe-rosters.h b/src/fe-common/fe-rosters.h
--- a/src/fe-common/fe-rosters.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/fe-rosters.h	2016-06-07 15:06:36.863515245 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_ROSTERS_H
 #define __FE__ROSTERS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_rosters_init(void);
 void fe_rosters_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: fe-rosters.o
diff -rBu a/src/fe-common/fe-stanzas.h b/src/fe-common/fe-stanzas.h
--- a/src/fe-common/fe-stanzas.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/fe-stanzas.h	2016-06-07 15:06:59.680652656 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_STANZAS_H
 #define __FE_STANZAS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_stanzas_init(void);
 void fe_stanzas_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: fe-stanzas.o
Only in b/src/fe-common: fe-xmpp-core.o
diff -rBu a/src/fe-common/fe-xmpp-messages.h b/src/fe-common/fe-xmpp-messages.h
--- a/src/fe-common/fe-xmpp-messages.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/fe-xmpp-messages.h	2016-06-07 15:07:17.607689178 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_XMPP_MESSAGES_H
 #define __FE_XMPP_MESSAGES_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_xmpp_messages_init(void);
 void fe_xmpp_messages_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: fe-xmpp-messages.o
diff -rBu a/src/fe-common/fe-xmpp-queries.h b/src/fe-common/fe-xmpp-queries.h
--- a/src/fe-common/fe-xmpp-queries.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/fe-xmpp-queries.h	2016-06-07 15:07:50.471700534 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_XMPP_QUERIES_H
 #define __FE_XMPP_QUERIES_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_xmpp_queries_init(void);
 void fe_xmpp_queries_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: fe-xmpp-queries.o
diff -rBu a/src/fe-common/fe-xmpp-status.h b/src/fe-common/fe-xmpp-status.h
--- a/src/fe-common/fe-xmpp-status.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/fe-xmpp-status.h	2016-06-07 15:04:55.894765477 +0200
@@ -3,12 +3,16 @@
 
 extern const char *fe_xmpp_presence_show[];
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 char		*fe_xmpp_status_get_window_name(XMPP_SERVER_REC *);
 WINDOW_REC	*fe_xmpp_status_get_window(XMPP_SERVER_REC *);
 
 void fe_xmpp_status_init(void);
 void fe_xmpp_status_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: fe-xmpp-status.o
diff -rBu a/src/fe-common/fe-xmpp-windows.h b/src/fe-common/fe-xmpp-windows.h
--- a/src/fe-common/fe-xmpp-windows.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/fe-xmpp-windows.h	2016-06-07 15:08:03.231963621 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_XMPP_WINDOWS_H
 #define __FE_XMPP_WINDOWS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_xmpp_windows_init(void);
 void fe_xmpp_windows_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: fe-xmpp-windows.o
Only in b/src/fe-common: libfe_xmpp.so
Only in b/src/fe-common: module-formats.o
diff -rBu a/src/fe-common/xep/fe-composing.h b/src/fe-common/xep/fe-composing.h
--- a/src/fe-common/xep/fe-composing.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-composing.h	2016-06-07 15:09:07.119947454 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_COMPOSING_H
 #define __FE_COMPOSING_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void	fe_composing_init(void);
 void	fe_composing_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-composing.o
diff -rBu a/src/fe-common/xep/fe-delay.h b/src/fe-common/xep/fe-delay.h
--- a/src/fe-common/xep/fe-delay.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-delay.h	2016-06-07 15:09:17.776833832 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_DELAY_H
 #define __FE_DELAY_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_delay_init(void);
 void fe_delay_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-delay.o
diff -rBu a/src/fe-common/xep/fe-muc.h b/src/fe-common/xep/fe-muc.h
--- a/src/fe-common/xep/fe-muc.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-muc.h	2016-06-07 15:09:29.967085155 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_MUC_H
 #define __FE_MUC_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_muc_init(void);
 void fe_muc_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-muc.o
diff -rBu a/src/fe-common/xep/fe-ping.h b/src/fe-common/xep/fe-ping.h
--- a/src/fe-common/xep/fe-ping.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-ping.h	2016-06-07 15:09:52.560884300 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_PING_H
 #define __FE_PING_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_ping_init(void);
 void fe_ping_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-ping.o
diff -rBu a/src/fe-common/xep/fe-registration.h b/src/fe-common/xep/fe-registration.h
--- a/src/fe-common/xep/fe-registration.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-registration.h	2016-06-07 15:10:20.631463026 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_REGISTRATION_H
 #define __FE_REGISTRATION_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_registration_init(void);
 void fe_registration_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-registration.o
diff -rBu a/src/fe-common/xep/fe-vcard.h b/src/fe-common/xep/fe-vcard.h
--- a/src/fe-common/xep/fe-vcard.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-vcard.h	2016-06-07 15:09:40.983978955 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_VCARD_H
 #define __FE_VCARD_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_vcard_init(void);
 void fe_vcard_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-vcard.o
diff -rBu a/src/fe-common/xep/fe-version.h b/src/fe-common/xep/fe-version.h
--- a/src/fe-common/xep/fe-version.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-version.h	2016-06-07 15:10:05.174477686 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_VERSION_H
 #define __FE_VERSION_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void fe_version_init(void);
 void fe_version_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-version.o
diff -rBu a/src/fe-common/xep/fe-xep.h b/src/fe-common/xep/fe-xep.h
--- a/src/fe-common/xep/fe-xep.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xep/fe-xep.h	2016-06-07 15:08:22.215688338 +0200
@@ -1,9 +1,13 @@
 #ifndef __FE_XEP_H
 #define __FE_XEP_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void	fe_xep_init(void);
 void	fe_xep_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common/xep: fe-xep.o
diff -rBu a/src/fe-common/xmpp-completion.h b/src/fe-common/xmpp-completion.h
--- a/src/fe-common/xmpp-completion.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xmpp-completion.h	2016-06-07 15:08:44.742819442 +0200
@@ -1,9 +1,13 @@
 #ifndef __XMPP_COMPLETION_H
 #define __XMPP_COMPLETION_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void xmpp_completion_init(void);
 void xmpp_completion_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: xmpp-completion.o
diff -rBu a/src/fe-common/xmpp-formats.h b/src/fe-common/xmpp-formats.h
--- a/src/fe-common/xmpp-formats.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-common/xmpp-formats.h	2016-06-07 15:05:42.712398046 +0200
@@ -1,9 +1,13 @@
 #ifndef __XMPP_FORMATS_H
 #define __XMPP_FORMATS_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void xmpp_formats_init(void);
 void xmpp_formats_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-common: xmpp-formats.o
Only in b/src/fe-text: libtext_xmpp.so
Only in b/src/fe-text: text-xmpp-core.o
diff -rBu a/src/fe-text/xep/text-composing.h b/src/fe-text/xep/text-composing.h
--- a/src/fe-text/xep/text-composing.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-text/xep/text-composing.h	2016-06-07 15:11:16.325944602 +0200
@@ -1,9 +1,13 @@
 #ifndef __TEXT_COMPOSING_H
 #define __TEXT_COMPOSING_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void text_composing_init(void);
 void text_composing_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-text/xep: text-composing.o
diff -rBu a/src/fe-text/xep/text-muc.h b/src/fe-text/xep/text-muc.h
--- a/src/fe-text/xep/text-muc.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-text/xep/text-muc.h	2016-06-07 15:11:28.886203553 +0200
@@ -1,9 +1,13 @@
 #ifndef __TEXT_MUC_H
 #define __TEXT_MUC_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void text_muc_init(void);
 void text_muc_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-text/xep: text-muc.o
diff -rBu a/src/fe-text/xep/text-xep.h b/src/fe-text/xep/text-xep.h
--- a/src/fe-text/xep/text-xep.h	2016-03-18 15:07:32.000000000 +0100
+++ b/src/fe-text/xep/text-xep.h	2016-06-07 15:11:03.165673278 +0200
@@ -1,9 +1,13 @@
 #ifndef __TEXT_XEP_H
 #define __TEXT_XEP_H
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 void	text_xep_init(void);
 void	text_xep_deinit(void);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
Only in b/src/fe-text/xep: text-xep.o