|
1 redefinition warnings for _FILE_OFFSET_BITS if config.h not included first. |
|
2 |
|
3 This may be fixed upstream in post-3.22 development - need to resync and |
|
4 determine if there's anything left to send upstream. |
|
5 |
|
6 --- evolution-data-server-3.16.2/libedataserver/e-source.c 2015-05-06 02:39:09.000000000 -0700 |
|
7 +++ evolution-data-server-3.16.2/libedataserver/e-source.c 2015-07-16 15:31:08.167638153 -0700 |
|
8 @@ -65,9 +65,12 @@ |
|
9 * fail with %G_IO_ERROR_NOT_SUPPORTED. |
|
10 **/ |
|
11 |
|
12 +#ifdef HAVE_CONFIG_H |
|
13 +#include <config.h> |
|
14 +#endif |
|
15 + |
|
16 #include "e-source.h" |
|
17 |
|
18 -#include <config.h> |
|
19 #include <string.h> |
|
20 #include <glib/gi18n-lib.h> |
|
21 |
|
22 --- evolution-data-server-3.16.2/libedataserver/e-source-registry.c 2015-03-22 23:41:04.000000000 -0700 |
|
23 +++ evolution-data-server-3.16.2/libedataserver/e-source-registry.c 2015-07-16 18:52:09.708140925 -0700 |
|
24 @@ -37,9 +37,12 @@ |
|
25 * book, calendar, memo list and task list for desktop integration. |
|
26 **/ |
|
27 |
|
28 +#ifdef HAVE_CONFIG_H |
|
29 +#include <config.h> |
|
30 +#endif |
|
31 + |
|
32 #include "e-source-registry.h" |
|
33 |
|
34 -#include <config.h> |
|
35 #include <glib/gstdio.h> |
|
36 #include <glib/gi18n-lib.h> |
|
37 |
|
38 --- evolution-data-server-3.16.2/libedataserver/e-source-collection.c 2015-03-22 23:41:04.000000000 -0700 |
|
39 +++ evolution-data-server-3.16.2/libedataserver/e-source-collection.c 2015-07-16 19:04:32.222032022 -0700 |
|
40 @@ -34,9 +34,12 @@ |
|
41 * ]| |
|
42 **/ |
|
43 |
|
44 +#ifdef HAVE_CONFIG_H |
|
45 +#include <config.h> |
|
46 +#endif |
|
47 + |
|
48 #include "e-source-collection.h" |
|
49 |
|
50 -#include <config.h> |
|
51 #include <glib/gi18n-lib.h> |
|
52 |
|
53 /* Private D-Bus classes. */ |
|
54 --- evolution-data-server-3.16.2/libedataserver/e-source-mail-signature.c 2015-03-22 23:41:04.000000000 -0700 |
|
55 +++ evolution-data-server-3.16.2/libedataserver/e-source-mail-signature.c 2015-07-16 19:04:48.534733808 -0700 |
|
56 @@ -34,9 +34,12 @@ |
|
57 * ]| |
|
58 **/ |
|
59 |
|
60 +#ifdef HAVE_CONFIG_H |
|
61 +#include <config.h> |
|
62 +#endif |
|
63 + |
|
64 #include "e-source-mail-signature.h" |
|
65 |
|
66 -#include <config.h> |
|
67 #include <string.h> |
|
68 #include <glib/gi18n-lib.h> |
|
69 |
|
70 --- evolution-data-server-3.16.2/libedataserver/e-source-proxy.c 2015-03-22 23:41:04.000000000 -0700 |
|
71 +++ evolution-data-server-3.16.2/libedataserver/e-source-proxy.c 2015-07-16 19:05:04.096807494 -0700 |
|
72 @@ -35,9 +35,12 @@ |
|
73 * ]| |
|
74 **/ |
|
75 |
|
76 +#ifdef HAVE_CONFIG_H |
|
77 +#include <config.h> |
|
78 +#endif |
|
79 + |
|
80 #include "e-source-proxy.h" |
|
81 |
|
82 -#include <config.h> |
|
83 #include <glib/gi18n-lib.h> |
|
84 |
|
85 #include <libedataserver/e-source-enumtypes.h> |