annotate src/bzip2-1-fixes.patch @ 4179:6409a12147fd

bzip2: use aff patch * src/bzip2.mk: remove SED mods to source * src/bzip2-1-fixes.patch: new file * dist-files.mk: add bzip2-1-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 26 Jul 2016 05:59:06 -0400
parents
children 6a63ec73029d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4179
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 This file is part of MXE.
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 See index.html for further information.
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 diff -uNr bzip2-1.0.6.orig/bzip2.c bzip2-1.0.6/bzip2.c
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 --- bzip2-1.0.6.orig/bzip2.c 2010-09-11 01:04:53.000000000 +0200
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 +++ bzip2-1.0.6/bzip2.c 2013-01-30 16:24:00.170396872 +0100
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 @@ -128,7 +128,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 #if BZ_LCCWIN32
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 # include <io.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 # include <fcntl.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 -# include <sys\stat.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 +# include <sys/stat.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 # define NORETURN /**/
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 # define PATH_SEP '\\'
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 --- bzip2-1.0.6.orig/bzlib.h 2010-09-11 01:08:42.000000000 +0200
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 +++ bzip2-1.0.6/bzlib.h 2013-01-30 16:22:10.514401460 +0100
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 @@ -75,7 +75,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 #include <stdio.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 #endif
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 -#ifdef _WIN32
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 +#if 0
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 # include <windows.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 # ifdef small
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 /* windows.h define small to char */
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 @@ -116,7 +116,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 bz_stream *strm,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 int verbosity,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 - int small
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 + int small_
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 );
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 @@ -140,7 +140,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 int* bzerror,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 FILE* f,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 int verbosity,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 - int small,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 + int small_,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 void* unused,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 int nUnused
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 );
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 @@ -216,7 +216,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47 unsigned int* destLen,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 char* source,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 unsigned int sourceLen,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 - int small,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51 + int small_,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 int verbosity
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 );
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54