[lxc-devel] [lxc/master] Revert "Merge pull request #1103 from brauner/2016-07-27/fix_android_…

brauner on Github lxc-bot at linuxcontainers.org
Thu Jul 28 08:59:49 UTC 2016


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 655 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160728/9a66231d/attachment.bin>
-------------- next part --------------
From 061f2b8a2b2ba6a6a37b67bece5585f7aa603eb7 Mon Sep 17 00:00:00 2001
From: Christian Brauner <cbrauner at suse.de>
Date: Thu, 28 Jul 2016 10:56:46 +0200
Subject: [PATCH] Revert "Merge pull request #1103 from
 brauner/2016-07-27/fix_android_getline"

This reverts commit 25796416084f3cecf036bd922d6ead094500191e, reversing
changes made to 813d7f1453e6e28adc0fdfac62d9c4597a87e430.

Contrary to what we suspected the android build errors were not caused by
missing wrong relative include paths. Rather, they were caused by autoconf.

Signed-off-by: Christian Brauner <cbrauner at suse.de>
---
 src/lxc/bdev/bdev.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/lxc/bdev/bdev.h b/src/lxc/bdev/bdev.h
index 1ffb590..3f21e84 100644
--- a/src/lxc/bdev/bdev.h
+++ b/src/lxc/bdev/bdev.h
@@ -33,13 +33,6 @@
 
 #include "config.h"
 
-/* Define getline() if missing from the C library */
-#ifndef HAVE_GETLINE
-#ifdef HAVE_FGETLN
-#include <../../include/getline.h>
-#endif
-#endif
-
 /* define constants if the kernel/glibc headers don't define them */
 #ifndef MS_DIRSYNC
 #define MS_DIRSYNC 128


More information about the lxc-devel mailing list