On Mon, Jan 13, 2014 at 05:46:50PM +0000, Luka Perkov wrote: > The removed chunk is already defined in utils.h which > is included in modified files. > > Signed-off-by: Luka Perkov <[email protected]>
Acked-by: Stéphane Graber <[email protected]> > --- > src/lxc/cgroup.c | 6 ------ > src/lxc/lxc_usernsexec.c | 6 ------ > src/lxc/lxccontainer.c | 6 ------ > src/lxc/utils.c | 6 ------ > 4 files changed, 24 deletions(-) > > diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c > index be43c73..a192c3d 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 6da4d64..35cd473 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 48fef74..ab97eef 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 2bb4d72..3746adb 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" > -- > 1.8.5.2 > > _______________________________________________ > lxc-devel mailing list > [email protected] > http://lists.linuxcontainers.org/listinfo/lxc-devel -- Stéphane Graber Ubuntu developer http://www.ubuntu.com
signature.asc
Description: Digital signature
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
