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