From: Luka Perkov <luka.perkov@sartura.hr>
Date: Mon, 13 Jan 2014 17:46:50 +0000 (+0000)
Subject: include: cleanup unnecessary getline defines
X-Git-Tag: lxc-1.0.0.beta2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f71e1bf61a7ad793bc3e35bcb3c82a86387eab1;p=thirdparty%2Flxc.git

include: cleanup unnecessary getline defines

The removed chunk is already defined in utils.h which
is included in modified files.

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index be43c73c4..a192c3d59 100644
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -55,12 +55,6 @@
 #include <mntent.h>
 #endif
 
-#ifndef HAVE_GETLINE
-#ifdef HAVE_FGETLN
-#include <../include/getline.h>
-#endif
-#endif
-
 lxc_log_define(lxc_cgroup, lxc);
 
 static struct cgroup_process_info *lxc_cgroup_process_info_getx(const char *proc_pid_cgroup_str, struct cgroup_meta_data *meta);
diff --git a/src/lxc/lxc_usernsexec.c b/src/lxc/lxc_usernsexec.c
index 6da4d6404..35cd4738b 100644
--- a/src/lxc/lxc_usernsexec.c
+++ b/src/lxc/lxc_usernsexec.c
@@ -43,12 +43,6 @@
 #include "namespace.h"
 #include "utils.h"
 
-#ifndef HAVE_GETLINE
-#ifdef HAVE_FGETLN
-#include <../include/getline.h>
-#endif
-#endif
-
 int unshare(int flags);
 
 static void usage(const char *name)
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 48fef74f8..ab97eef14 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -61,12 +61,6 @@
 #include <../include/ifaddrs.h>
 #endif
 
-#ifndef HAVE_GETLINE
-#ifdef HAVE_FGETLN
-#include <../include/getline.h>
-#endif
-#endif
-
 #define MAX_BUFFER 4096
 
 lxc_log_define(lxc_container, lxc);
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 2bb4d7205..3746adb9f 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -40,12 +40,6 @@
 #include <sys/wait.h>
 #include <assert.h>
 
-#ifndef HAVE_GETLINE
-#ifdef HAVE_FGETLN
-#include <../include/getline.h>
-#endif
-#endif
-
 #include "utils.h"
 #include "log.h"
 #include "lxclock.h"