author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
Fri, 28 Oct 2016 14:58:48 -0700 | |
changeset 7197 | 5001d53d2e77 |
permissions | -rw-r--r-- |
7197
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
If _XOPEN_SOURCE is defined, the library must be built as an xpg6 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
application, however it is not, so we instead define __EXTENSIONS__ in the |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
Makefile and then avoid defining _XOPEN_SOURCE. |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
Needs investigation before contributing to upstream. |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
--- mutter-3.16.1/src/core/delete.c 2015-04-14 12:55:28.000000000 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ mutter-3.16.1.new/src/core/delete.c 2015-07-18 12:57:28.387713815 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -20,7 +20,9 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
* along with this program; if not, see <http://www.gnu.org/licenses/>. |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
*/ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
+#ifndef __EXTENSIONS__ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
#define _XOPEN_SOURCE /* for kill() */ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
+#endif |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
#include <config.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
#include "util-private.h" |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
19 |
--- mutter-3.16.1/src/core/display.c 2015-04-14 12:56:09.000000000 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
20 |
+++ mutter-3.16.1.new/src/core/display.c 2015-07-18 12:57:03.109624404 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
21 |
@@ -28,7 +28,9 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
22 |
* The display is represented as a #MetaDisplay struct. |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
23 |
*/ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
24 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
25 |
+#ifndef __EXTENSIONS__ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
26 |
#define _XOPEN_SOURCE 600 /* for gethostname() */ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
27 |
+#endif |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
28 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
29 |
#include <config.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
30 |
#include "display-private.h" |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
31 |
--- mutter-3.16.1/src/core/main.c 2015-04-14 12:55:28.000000000 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
32 |
+++ mutter-3.16.1.new/src/core/main.c 2015-07-18 12:57:20.499111571 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
33 |
@@ -42,7 +42,9 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
34 |
*/ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
35 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
36 |
#define _GNU_SOURCE |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
37 |
+#ifndef __EXTENSIONS__ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
38 |
#define _XOPEN_SOURCE /* for putenv() and some signal-related functions */ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
39 |
+#endif |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
40 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
41 |
#include <config.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
42 |
#include <meta/main.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
43 |
--- mutter-3.16.1/src/x11/window-props.c 2015-04-06 15:17:15.000000000 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
44 |
+++ mutter-3.16.1.new/src/x11/window-props.c 2015-07-18 12:56:41.006550890 -0700 |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
45 |
@@ -35,7 +35,9 @@ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
46 |
*/ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
47 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
48 |
#define _GNU_SOURCE |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
49 |
+#ifndef __EXTENSIONS__ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
50 |
#define _XOPEN_SOURCE 500 /* for gethostname() */ |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
51 |
+#endif |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
52 |
|
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
53 |
#include <config.h> |
5001d53d2e77
23245657 Deliver mutter 3.18.1 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
54 |
#include "window-props.h" |