Attachment #702480 for bug #784266

Lines 25-34 Link Here

(-)a/pan/data-impl/article-filter.cc (-4 / +1 lines)
25	#include <gmime/gmime.h>	25	#include <gmime/gmime.h>
26		26
27	//#include <glib/gprintf.h>	27	//#include <glib/gprintf.h>
28	extern "C"	28	#include <glib.h>
29	{
30	#include <glib.h>
31	}
32		29
33	#include "article-filter.h"	30	#include "article-filter.h"
34		31

Lines 24-31 Link Here

(-)a/pan/data-impl/data-impl.cc (-1 / +1 lines)
24	#include <config.h>	24	#include <config.h>
25	extern "C" {	25	extern "C" {
26	#include <glib/gi18n.h>	26	#include <glib/gi18n.h>
27	#include <glib.h> // for g_build_filename
28	}	27	}
		28	#include <glib.h> // for g_build_filename
29	#include <pan/general/debug.h>	29	#include <pan/general/debug.h>
30	#include <pan/general/file-util.h>	30	#include <pan/general/file-util.h>
31	#include <pan/general/log.h>	31	#include <pan/general/log.h>

Lines 27-35 extern "C" { Link Here

(-)a/pan/data-impl/data-io.cc (-2 / +2 lines)
27	#include <sys/types.h> // for chmod	27	#include <sys/types.h> // for chmod
28	#include <sys/stat.h> // for chmod	28	#include <sys/stat.h> // for chmod
29	#include <unistd.h>	29	#include <unistd.h>
30	#include <glib.h>
31	#include <glib/gi18n.h>
32	}	30	}
		31	#include <glib.h>
		32	#include <glib/gi18n.h>
33	#include <pan/general/debug.h>	33	#include <pan/general/debug.h>
34	#include <pan/general/file-util.h>	34	#include <pan/general/file-util.h>
35	#include <pan/general/line-reader.h>	35	#include <pan/general/line-reader.h>

Lines 29-37 Link Here

(-)a/pan/data-impl/groups.cc (-1 / +1 lines)
29	#include <vector>	29	#include <vector>
30		30
31	#include <glib.h>	31	#include <glib.h>
		32	#include <glib/gi18n.h>
32	extern "C" {	33	extern "C" {
33	#include <unistd.h>	34	#include <unistd.h>
34	#include <glib/gi18n.h>
35	}	35	}
36		36
37	#include <pan/general/debug.h>	37	#include <pan/general/debug.h>

Lines 25-34 Link Here

(-)a/pan/data-impl/headers.cc (-1 / +1 lines)
25	#include <string>	25	#include <string>
26	#include <cmath>	26	#include <cmath>
27	#include <glib.h>	27	#include <glib.h>
		28	#include <glib/gi18n.h>
28	extern "C" {	29	extern "C" {
29	#include <sys/types.h> // for chmod	30	#include <sys/types.h> // for chmod
30	#include <sys/stat.h> // for chmod	31	#include <sys/stat.h> // for chmod
31	#include <glib/gi18n.h>
32	}	32	}
33	#include <pan/general/debug.h>	33	#include <pan/general/debug.h>
34	#include <pan/general/log.h>	34	#include <pan/general/log.h>

Lines 26-34 Link Here

(-)a/pan/data-impl/profiles.cc (-2 / +2 lines)
26	extern "C" {	26	extern "C" {
27	#include <sys/types.h> // for chmod	27	#include <sys/types.h> // for chmod
28	#include <sys/stat.h> // for chmod	28	#include <sys/stat.h> // for chmod
29	#include <glib.h>
30	#include <glib/gi18n.h>
31	}	29	}
		30	#include <glib.h>
		31	#include <glib/gi18n.h>
32	#include <pan/general/debug.h>	32	#include <pan/general/debug.h>
33	#include <pan/general/string-view.h>	33	#include <pan/general/string-view.h>
34	#include <pan/general/file-util.h>	34	#include <pan/general/file-util.h>

Lines 25-34 Link Here

(-)a/pan/data-impl/server.cc (-4 / +2 lines)
25	#include <map>	25	#include <map>
26	#include <set>	26	#include <set>
27	#include <vector>	27	#include <vector>
28	extern "C" {	28	#include <glib.h> // for GMarkup
29	#include <glib.h> // for GMarkup	29	#include <glib/gi18n.h>
30	#include <glib/gi18n.h>
31	}
32	#include <pan/general/debug.h>	30	#include <pan/general/debug.h>
33	#include <pan/general/file-util.h>	31	#include <pan/general/file-util.h>
34	#include <pan/general/log.h>	32	#include <pan/general/log.h>




  #include <unistd.h>
  #include <dirent.h>

  #include <glib.h>
  #include <glib/gi18n.h>
  #include <gmime/gmime.h>
}
#include <glib.h>
#include <glib/gi18n.h>

#include <pan/general/debug.h>
#include <pan/general/file-util.h>

Lines 22-30 Link Here

(-)a/pan/data/article-cache.h (-3 / +1 lines)
22		22
23	#include <map>	23	#include <map>
24	#include <vector>	24	#include <vector>
25	extern "C" {	25	#include <glib.h> // for guint64
26	#include <glib.h> // for guint64
27	}
28	#include <pan/general/string-view.h>	26	#include <pan/general/string-view.h>
29	#include <pan/general/quark.h>	27	#include <pan/general/quark.h>
30		28

Lines 34-43 Link Here

(-)a/pan/data/cert-store.cc (-2 lines)
34	#include <iostream>	34	#include <iostream>
35	#include <string>	35	#include <string>
36		36
37	extern "C" {
38	#include <glib/gi18n.h>	37	#include <glib/gi18n.h>
39	#include <glib.h>	38	#include <glib.h>
40	}
41		39
42	#include <pan/general/debug.h>	40	#include <pan/general/debug.h>
43	#include <pan/general/e-util.h>	41	#include <pan/general/e-util.h>




  #include <unistd.h>
  #include <dirent.h>

  #include <glib.h>
  #include <glib/gi18n.h>
  #include <gmime/gmime.h>
}
#include <glib.h>
#include <glib/gi18n.h>

#include <pan/general/debug.h>
#include <pan/general/file-util.h>

Lines 22-30 Link Here

(-)a/pan/data/encode-cache.h (-3 / +1 lines)
22		22
23	#include <map>	23	#include <map>
24	#include <vector>	24	#include <vector>
25	extern "C" {	25	#include <glib.h> // for guint64
26	#include <glib.h> // for guint64
27	}
28	#include <pan/general/string-view.h>	26	#include <pan/general/string-view.h>
29	#include <pan/general/quark.h>	27	#include <pan/general/quark.h>
30		28

Lines 26-34 Link Here

(-)a/pan/general/e-util.cc (-2 / +2 lines)
26	#include <ctime>	26	#include <ctime>
27	extern "C" {	27	extern "C" {
28	#include <ctype.h>	28	#include <ctype.h>
29	#include <glib.h>
30	#include <glib/gi18n.h>
31	}	29	}
		30	#include <glib.h>
		31	#include <glib/gi18n.h>
32	#include "debug.h"	32	#include "debug.h"
33	#include "e-util.h"	33	#include "e-util.h"
34		34




  #include <unistd.h>
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <glib.h>
  #include <glib/gi18n.h>
  #ifndef G_OS_WIN32
    #include <pwd.h>
  #endif
}
#include <glib.h>
#include <glib/gi18n.h>

#include "debug.h"
#include "log.h"

Lines 25-33 Link Here

(-)a/pan/general/file-util.h (-2 / +2 lines)
25	extern "C" {	25	extern "C" {
26	#include <stddef.h>	26	#include <stddef.h>
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <glib.h>
29	#include <glib/gstdio.h>
30	}	28	}
		29	#include <glib.h>
		30	#include <glib/gstdio.h>
31	#include <pan/general/string-view.h>	31	#include <pan/general/string-view.h>
32		32
33	#define g_freopen freopen	33	#define g_freopen freopen

Lines 63-71 Link Here

(-)a/pan/general/macros.h (-4 / +1 lines)
63	*** g_assert	63	*** g_assert
64	**/	64	**/
65		65
66	extern "C"	66	#include <glib.h>
67	{
68	#include <glib.h>
69	}
70		67
71	#endif	68	#endif

Lines 20-28 Link Here

(-)a/pan/general/text-match.cc (-2 / +2 lines)
20	#include <config.h>	20	#include <config.h>
21	extern "C" {	21	extern "C" {
22	#include <ctype.h>	22	#include <ctype.h>
23	#include <glib.h>
24	#include <glib/gi18n.h>
25	}	23	}
		24	#include <glib.h>
		25	#include <glib/gi18n.h>
26	#include "debug.h"	26	#include "debug.h"
27	#include "log.h"	27	#include "log.h"
28	#include "text-match.h"	28	#include "text-match.h"

Lines 18-26 Link Here

(-)a/pan/gui/dl-headers-ui.cc (-2 / +2 lines)
18	*/	18	*/
19		19
20	#include <config.h>	20	#include <config.h>
		21	#include <glib.h>
		22	#include <glib/gi18n.h>
21	extern "C" {	23	extern "C" {
22	#include <glib.h>
23	#include <glib/gi18n.h>
24	#include "gtk-compat.h"	24	#include "gtk-compat.h"
25	}	25	}
26	#include <pan/general/macros.h>	26	#include <pan/general/macros.h>

Lines 18-26 Link Here

(-)a/pan/gui/group-prefs-dialog.cc (-2 / +2 lines)
18	*/	18	*/
19		19
20	#include <config.h>	20	#include <config.h>
		21	#include <glib/gi18n.h>
		22	#include <glib.h>
21	extern "C" {	23	extern "C" {
22	#include <glib/gi18n.h>
23	#include <glib.h>
24	#include "gtk-compat.h"	24	#include "gtk-compat.h"
25	#ifdef HAVE_GTKSPELL	25	#ifdef HAVE_GTKSPELL
26	#include <enchant/enchant.h>	26	#include <enchant/enchant.h>

Lines 21-28 extern "C" { Link Here

(-)a/pan/gui/group-prefs.cc (-1 / +1 lines)
21	#include <config.h>	21	#include <config.h>
22	#include <sys/types.h> // chmod	22	#include <sys/types.h> // chmod
23	#include <sys/stat.h> // chmod	23	#include <sys/stat.h> // chmod
24	#include <glib.h>
25	}	24	}
		25	#include <glib.h>
26	#include <iostream>	26	#include <iostream>
27	#include <fstream>	27	#include <fstream>
28	#include <pan/general/file-util.h>	28	#include <pan/general/file-util.h>

Lines 24-31 Link Here

(-)a/pan/gui/prefs-file.cc (-1 / +1 lines)
24	extern "C" {	24	extern "C" {
25	#include <sys/types.h> // for chmod	25	#include <sys/types.h> // for chmod
26	#include <sys/stat.h> // for chmod	26	#include <sys/stat.h> // for chmod
27	#include <glib.h>
28	}	27	}
		28	#include <glib.h>
29	#include <pan/general/file-util.h>	29	#include <pan/general/file-util.h>
30	#include "prefs-file.h"	30	#include "prefs-file.h"
31		31

Lines 23-32 Link Here

(-)a/pan/gui/prefs.cc (-4 / +2 lines)
23	#include <iostream>	23	#include <iostream>
24	#include <sstream>	24	#include <sstream>
25	#include <string>	25	#include <string>
26	extern "C" {	26	#include <glib.h>
27	#include <glib.h>	27	#include <glib/gi18n.h>
28	#include <glib/gi18n.h>
29	}
30	#include <pan/general/debug.h>	28	#include <pan/general/debug.h>
31	#include <pan/general/log.h>	29	#include <pan/general/log.h>
32	#include <pan/general/macros.h>	30	#include <pan/general/macros.h>

Lines 21-29 Link Here

(-)a/pan/gui/server-ui.cc (-2 / +2 lines)
21	#include <cstdlib>	21	#include <cstdlib>
22	#include <cstring>	22	#include <cstring>
23	#include <climits>	23	#include <climits>
		24	#include <glib.h>
		25	#include <glib/gi18n.h>
24	extern "C" {	26	extern "C" {
25	#include <glib.h>
26	#include <glib/gi18n.h>
27	#include "gtk-compat.h"	27	#include "gtk-compat.h"
28	}	28	}
29		29

Lines 18-26 Link Here

(-)a/pan/gui/task-pane.cc (-2 / +2 lines)
18	*/	18	*/
19		19
20	#include <config.h>	20	#include <config.h>
		21	#include <glib.h>
		22	#include <glib/gi18n.h>
21	extern "C" {	23	extern "C" {
22	#include <glib.h>
23	#include <glib/gi18n.h>
24	#include "gtk-compat.h"	24	#include "gtk-compat.h"
25	}	25	}
26	#include <pan/general/e-util.h>	26	#include <pan/general/e-util.h>

Lines 20-29 Link Here

(-)a/pan/gui/url.cc (-4 / +2 lines)
20	#include <config.h>	20	#include <config.h>
21	#include <iostream>	21	#include <iostream>
22	#include <string>	22	#include <string>
23	extern "C" {	23	#include <glib.h>
24	#include <glib.h>	24	#include <glib/gi18n.h>
25	#include <glib/gi18n.h>
26	};
27	#include <pan/general/log.h>	25	#include <pan/general/log.h>
28	#include "url.h"	26	#include "url.h"
29		27

Lines 22-31 Link Here

(-)a/pan/tasks/nntp.cc (-4 / +2 lines)
22	#include <cstdarg>	22	#include <cstdarg>
23	#include <cstdlib> // abort, atoi, strtoul	23	#include <cstdlib> // abort, atoi, strtoul
24	#include <cstdio> // snprintf	24	#include <cstdio> // snprintf
25	extern "C" {	25	#include <glib.h>
26	#include <glib.h>	26	#include <glib/gi18n.h>
27	#include <glib/gi18n.h>
28	}
29	#include <pan/general/debug.h>	27	#include <pan/general/debug.h>
30	#include <pan/general/log.h>	28	#include <pan/general/log.h>
31	#include <pan/general/messages.h>	29	#include <pan/general/messages.h>

Lines 24-32 Link Here

(-)a/pan/tasks/nzb.cc (-3 / +1 lines)
24	#include <sstream>	24	#include <sstream>
25	#include <string>	25	#include <string>
26	#include <map>	26	#include <map>
27	extern "C" {	27	#include <glib.h>
28	#include <glib.h>
29	}
30	#include <pan/general/debug.h>	28	#include <pan/general/debug.h>
31	#include <pan/general/file-util.h>	29	#include <pan/general/file-util.h>
32	#include <pan/general/log.h>	30	#include <pan/general/log.h>

Lines 30-39 Link Here

(-)a/pan/tasks/socket-impl-main.cc (-4 / +1 lines)
30	//#include <glib/giochannel.h>	30	//#include <glib/giochannel.h>
31	//#include <glib/gstring.h>	31	//#include <glib/gstring.h>
32		32
33	extern "C"	33	#include <glib.h>
34	{
35	#include <glib.h>
36	}
37		34
38	#include <pan/tasks/socket.h>	35	#include <pan/tasks/socket.h>
39		36

Lines 27-36 Link Here

(-)a/pan/tasks/socket-impl-openssl.h (-4 / +1 lines)
27	#include <string>	27	#include <string>
28	//#include <glib/giochannel.h>	28	//#include <glib/giochannel.h>
29	//#include <glib/gstring.h>	29	//#include <glib/gstring.h>
30	extern "C"	30	#include <glib.h>
31	{
32	#include <glib.h>
33	}
34		31
35	#include <pan/general/debug.h>	32	#include <pan/general/debug.h>
36	#include <pan/general/quark.h>	33	#include <pan/general/quark.h>

Lines 21-29 Link Here

(-)a/pan/tasks/socket.cc (-3 / +1 lines)
21	#include <cstdarg>	21	#include <cstdarg>
22	#include <ctime>	22	#include <ctime>
23	#include <cmath>	23	#include <cmath>
24	extern "C" {	24	#include <glib.h>
25	#include <glib.h>
26	}
27	#include <pan/general/debug.h>	25	#include <pan/general/debug.h>
28	#include <pan/general/string-view.h>	26	#include <pan/general/string-view.h>
29	#include "socket.h"	27	#include "socket.h"

Lines 18-27 Link Here

(-)a/pan/usenet-utils/filter-info.cc (-4 / +2 lines)
18	*/	18	*/
19		19
20	#include <config.h>	20	#include <config.h>
21	extern "C" {	21	#include <glib.h>
22	#include <glib.h>	22	#include <glib/gi18n.h>
23	#include <glib/gi18n.h>
24	}
25	#include <pan/general/macros.h>	23	#include <pan/general/macros.h>
26	#include "filter-info.h"	24	#include "filter-info.h"
27		25

Lines 21-29 Link Here

(-)a/pan/usenet-utils/message-check.cc (-2 lines)
21	#include <ctype.h>	21	#include <ctype.h>
22	#include <string.h>	22	#include <string.h>
23	#include <glib.h>	23	#include <glib.h>
24	extern "C" {
25	#include <glib/gi18n.h>	24	#include <glib/gi18n.h>
26	}
27	#include <pan/general/debug.h>	25	#include <pan/general/debug.h>
28	#include <pan/general/macros.h>	26	#include <pan/general/macros.h>
29	#include <pan/general/string-view.h>	27	#include <pan/general/string-view.h>

Lines 22-31 Link Here

(-)a/pan/usenet-utils/rules-info.cc (-4 / +2 lines)
22		22
23		23
24	#include <config.h>	24	#include <config.h>
25	extern "C" {	25	#include <glib.h>
26	#include <glib.h>	26	#include <glib/gi18n.h>
27	#include <glib/gi18n.h>
28	}
29	#include <pan/general/macros.h>	27	#include <pan/general/macros.h>
30	#include "rules-info.h"	28	#include "rules-info.h"
31		29

Lines 22-30 Link Here

(-)a/pan/usenet-utils/text-massager.cc (-2 lines)
22	#include <map>	22	#include <map>
23	#include <cstring>	23	#include <cstring>
24	#include <glib.h>	24	#include <glib.h>
25	extern "C" {
26	#include <glib/gi18n.h>	25	#include <glib/gi18n.h>
27	}
28	#include "text-massager.h"	26	#include "text-massager.h"
29	#include <pan/general/log.h>	27	#include <pan/general/log.h>
30	#include <pan/general/e-util.h>	28	#include <pan/general/e-util.h>

Return to bug 784266

Lines 27-36 extern "C" Link Here

(-)a/pan/data/article-cache.cc (-2 / +2 lines)
27	#include <unistd.h>	27	#include <unistd.h>
28	#include <dirent.h>	28	#include <dirent.h>
29		29
30	#include <glib.h>
31	#include <glib/gi18n.h>
32	#include <gmime/gmime.h>	30	#include <gmime/gmime.h>
33	}	31	}
		32	#include <glib.h>
		33	#include <glib/gi18n.h>
34		34
35	#include <pan/general/debug.h>	35	#include <pan/general/debug.h>
36	#include <pan/general/file-util.h>	36	#include <pan/general/file-util.h>

Lines 29-38 extern "C" Link Here

(-)a/pan/data/encode-cache.cc (-2 / +2 lines)
29	#include <unistd.h>	29	#include <unistd.h>
30	#include <dirent.h>	30	#include <dirent.h>
31		31
32	#include <glib.h>
33	#include <glib/gi18n.h>
34	#include <gmime/gmime.h>	32	#include <gmime/gmime.h>
35	}	33	}
		34	#include <glib.h>
		35	#include <glib/gi18n.h>
36		36
37	#include <pan/general/debug.h>	37	#include <pan/general/debug.h>
38	#include <pan/general/file-util.h>	38	#include <pan/general/file-util.h>

Lines 27-38 extern "C" Link Here

(-)a/pan/general/file-util.cc (-2 / +2 lines)
27	#include <unistd.h>	27	#include <unistd.h>
28	#include <sys/stat.h>	28	#include <sys/stat.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <glib.h>
31	#include <glib/gi18n.h>
32	#ifndef G_OS_WIN32	30	#ifndef G_OS_WIN32
33	#include <pwd.h>	31	#include <pwd.h>
34	#endif	32	#endif
35	}	33	}
		34	#include <glib.h>
		35	#include <glib/gi18n.h>
36		36
37	#include "debug.h"	37	#include "debug.h"
38	#include "log.h"	38	#include "log.h"