patch -p1 from the root of the tree, -p2 in src/
It could be that the cut/paste isnt working - in which case, just take
a look at src/zlink.c and move the "#include <zlib.h>" down under
memcount.h
-Aaron
On Sun, Jul 18, 2010 at 2:33 PM, Chris Malayter <mustangthz(a)gmail.com> wrote:
> What's the syntax to apply that patch?
>
> If I apply it in the root directory of 1.8.9 it can't find zlib.h
>
> If I apply it in /src:
>
> %patch < patch
> Hmm... Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |diff --git a/src/zlink.c b/src/zlink.c
> |index f724125..7d46ff7 100644
> |--- a/src/zlink.c
> |+++ b/src/zlink.c
> --------------------------
> Patching file zlink.c using Plan A...
> patch: **** malformed patch at line 6: #include <stdio.h>
>
>
> -Chris
>
>
>
>
> On Jul 18, 2010, at 1:24 PM, Aaron Wiebe wrote:
>
>> diff --git a/src/zlink.c b/src/zlink.c
>> index f724125..7d46ff7 100644
>> --- a/src/zlink.c
>> +++ b/src/zlink.c
>> @@ -26,8 +26,8 @@
>> #include <stdio.h>
>> #include <stdlib.h>
>> #include <string.h>
>> -#include <zlib.h>
>> #include "memcount.h"
>> +#include <zlib.h>
>>
>> #define COMPRESSION_LEVEL 3 /* 0 to 9, 0 = none */
>> #define ZIP_MIN_BLOCK 1024 /* smallest block to compress */
>
>
