Reattached. On Thu, 2011-02-10 at 10:34 -0300, Eduardo Silva wrote: > Hi Dave, > > the patch is not applying as i modified some headers before you > provide it :/ , sorry about that, here's the output: > > edsiper@monotop:~/coding/monkey$ git apply > 0001-Remove-header-files-which-are-duplicatedly-included.patch > error: patch failed: src/request.c:57 > error: src/request.c: patch does not apply > > > in any case please send me a fresh one if you still find the problem, > > thanks! > > On Wed, Feb 9, 2011 at 7:51 PM, Davidlohr Bueso <[email protected]> wrote: > Thanks. > > > > -- > Eduardo Silva > http://edsiper.linuxchile.cl > http://www.monkey-project.com
>From c354a38b282a5436546a19753640094dffce2f8e Mon Sep 17 00:00:00 2001 From: Davidlohr Bueso <[email protected]> Date: Thu, 10 Feb 2011 11:13:47 -0300 Subject: [PATCH] Remove duplicate headers. --- src/request.c | 4 ---- src/user.c | 1 - src/utils.c | 1 - 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/request.c b/src/request.c index f3ad43b..4eb1dbd 100644 --- a/src/request.c +++ b/src/request.c @@ -33,8 +33,6 @@ #include <signal.h> #include <errno.h> -#include <string.h> - #include <arpa/inet.h> #include <netinet/in.h> #include <sys/types.h> @@ -48,7 +46,6 @@ #include "config.h" #include "scheduler.h" #include "epoll.h" -#include "socket.h" #include "utils.h" #include "header.h" #include "user.h" @@ -57,7 +54,6 @@ #include "socket.h" #include "cache.h" #include "clock.h" -#include "utils.h" #include "plugin.h" #include "macros.h" diff --git a/src/user.c b/src/user.c index afd93aa..332e007 100644 --- a/src/user.c +++ b/src/user.c @@ -23,7 +23,6 @@ #include <stdlib.h> #include <string.h> #include <pwd.h> -#include <sys/types.h> #include <unistd.h> #include <sys/resource.h> #include <sys/types.h> diff --git a/src/utils.c b/src/utils.c index bd35ad0..bd0f8d2 100644 --- a/src/utils.c +++ b/src/utils.c @@ -23,7 +23,6 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <assert.h> #include <errno.h> #include <err.h> -- 1.7.1
_______________________________________________ Monkey mailing list [email protected] http://lists.monkey-project.com/listinfo/monkey
