From: Christian Brauner <cbrauner@suse.de>
Date: Thu, 28 Jul 2016 08:56:46 +0000 (+0200)
Subject: Revert "Merge pull request #1103 from brauner/2016-07-27/fix_android_getline"
X-Git-Tag: lxc-2.1.0~372^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1104%2Fhead;p=thirdparty%2Flxc.git

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@suse.de>
---

diff --git a/src/lxc/bdev/bdev.h b/src/lxc/bdev/bdev.h
index 1ffb590aa..3f21e8404 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