author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
Tue, 14 Jun 2016 20:31:53 -0700 | |
changeset 6217 | f2179bfee747 |
permissions | -rw-r--r-- |
6217
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
Solaris specific changes for compiling |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
|
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
--- polkit-0.113/src/programs/pkexec.c~ 2015-06-18 13:20:50.000000000 -0700 |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ polkit-0.113/src/programs/pkexec.c 2015-10-03 16:56:07.991084261 -0700 |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -246,6 +246,13 @@ |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
return TRUE; |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
} |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
|
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
+/* Solaris already has a fdwalk() defined in <stdlib.h> so we need to avoid |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
+ * conflicting definitions. |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
+ */ |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
+#ifdef HAVE_SOLARIS |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
+# define fdwalk pkfdwalk |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
+#endif |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
+ |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
static gboolean |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
fdwalk (FdCallback callback, |
f2179bfee747
23245662 Deliver polkit 0.113 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
gpointer user_data) |