commit 52447887e50b49f33f959077c31232edff6659d8
author Elliott Hughes <enh@google.com> Wed Aug 20 17:42:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 19 22:55:35 2014 +0000
tree 5d6465220c5ed9a7413f9e4782217dcf153d5e87
parent 1d1011a3c5049a7f9eef99d22f3704e4367579cc
parent 504f8866c4a2a88f13f57ae687bcb15eaa8a4b18

Merge "libcap-ng can compile out of the box now."

libcap-ng-0.7/src/cap-ng.c

diff --git a/libcap-ng-0.7/src/cap-ng.c b/libcap-ng-0.7/src/cap-ng.c
index a7124f1..cf99b3e 100644
--- a/libcap-ng-0.7/src/cap-ng.c
+++ b/libcap-ng-0.7/src/cap-ng.c
@@ -25,9 +25,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#if !defined(ANDROID)
 #include <stdio_ext.h>
-#endif
 #include <stdlib.h>
 #include <sys/prctl.h>
 #include <grp.h>
@@ -244,9 +242,7 @@
 	f = fopen(buf, "re");
 	if (f == NULL)
 		return -1;
-#if !defined(ANDROID)
 	__fsetlocking(f, FSETLOCKING_BYCALLER);
-#endif
 	while (fgets(buf, sizeof(buf), f)) {
 		if (strncmp(buf, "CapB", 4))
 			continue;

libcap-ng-0.7/utils/pscap.c

diff --git a/libcap-ng-0.7/utils/pscap.c b/libcap-ng-0.7/utils/pscap.c
index 5907513..1496584 100644
--- a/libcap-ng-0.7/utils/pscap.c
+++ b/libcap-ng-0.7/utils/pscap.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 #include <stdio.h>
-#if !defined(ANDROID)
 #include <stdio_ext.h>
-#endif
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -128,9 +126,7 @@
 				euid = 0;
 			else {
 				line = 0;
-#if !defined(ANDROID)
 				__fsetlocking(f, FSETLOCKING_BYCALLER);
-#endif
 				while (fgets(buf, sizeof(buf), f)) {
 					if (line == 0) {
 						line++;