d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mxe/src/bzip2-1-fixes.patch

64 lines
1.5 KiB
Diff
Raw Permalink Normal View History

Copyright headers: point to LICENSE.md and shorten The following script was applied: sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE') sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \ $(git grep -l 'part of MXE.*See index.html') before='This file is part of MXE. See index.html for further information.' after='This file is part of MXE. See LICENSE.md for licensing information.' sed "s/$before/$after/" -i $(git grep -l 'part of MXE') Then git grep 'index.html for further information' revealed two other files. One of them was patched manually (patch.mk). Makefile has text "See index.html for further information" unrelated to licensing. See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-22 20:52:34 +01:00
This file is part of MXE. See LICENSE.md for licensing information.
package bzip2: fix runtime crashes This moves the source modifications from the Makefile into a patch, and it adds a critical change: instead of removing WINAPI, the whole _WIN32 preprocessor block is deactivated. This fixes the BZ_API macro. This is necessary to fix runtime crashes in my application.
2013-01-30 17:10:28 +00:00
various packages: manually convert *-1-fixes.patch to format-patch style
2017-11-18 10:51:26 +00:00
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 20:31:24 +1100
various packages: run `make refresh-patches` with numbering
2017-11-18 13:44:43 +00:00
Subject: [PATCH 1/1] fixes
various packages: manually convert *-1-fixes.patch to format-patch style
2017-11-18 10:51:26 +00:00
diff --git a/bzip2.c b/bzip2.c
index 1111111..2222222 100644
--- a/bzip2.c
+++ b/bzip2.c
package bzip2: fix runtime crashes This moves the source modifications from the Makefile into a patch, and it adds a critical change: instead of removing WINAPI, the whole _WIN32 preprocessor block is deactivated. This fixes the BZ_API macro. This is necessary to fix runtime crashes in my application.
2013-01-30 17:10:28 +00:00
@@ -128,7 +128,7 @@
#if BZ_LCCWIN32
# include <io.h>
# include <fcntl.h>
-# include <sys\stat.h>
+# include <sys/stat.h>
# define NORETURN /**/
# define PATH_SEP '\\'
various packages: manually convert *-1-fixes.patch to format-patch style
2017-11-18 10:51:26 +00:00
diff --git a/bzlib.h b/bzlib.h
index 1111111..2222222 100644
--- a/bzlib.h
+++ b/bzlib.h
@@ -75,7 +75,7 @@ typedef
package bzip2: fix runtime crashes This moves the source modifications from the Makefile into a patch, and it adds a critical change: instead of removing WINAPI, the whole _WIN32 preprocessor block is deactivated. This fixes the BZ_API macro. This is necessary to fix runtime crashes in my application.
2013-01-30 17:10:28 +00:00
#include <stdio.h>
#endif
-#ifdef _WIN32
+#if 0
# include <windows.h>
# ifdef small
/* windows.h define small to char */
various packages: manually convert *-1-fixes.patch to format-patch style
2017-11-18 10:51:26 +00:00
@@ -116,7 +116,7 @@ BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
package bzip2: fix runtime crashes This moves the source modifications from the Makefile into a patch, and it adds a critical change: instead of removing WINAPI, the whole _WIN32 preprocessor block is deactivated. This fixes the BZ_API macro. This is necessary to fix runtime crashes in my application.
2013-01-30 17:10:28 +00:00
BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
bz_stream *strm,
int verbosity,
- int small
+ int small_
);
BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
various packages: manually convert *-1-fixes.patch to format-patch style
2017-11-18 10:51:26 +00:00
@@ -140,7 +140,7 @@ BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
package bzip2: fix runtime crashes This moves the source modifications from the Makefile into a patch, and it adds a critical change: instead of removing WINAPI, the whole _WIN32 preprocessor block is deactivated. This fixes the BZ_API macro. This is necessary to fix runtime crashes in my application.
2013-01-30 17:10:28 +00:00
int* bzerror,
FILE* f,
int verbosity,
- int small,
+ int small_,
void* unused,
int nUnused
);
various packages: manually convert *-1-fixes.patch to format-patch style
2017-11-18 10:51:26 +00:00
@@ -216,7 +216,7 @@ BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
package bzip2: fix runtime crashes This moves the source modifications from the Makefile into a patch, and it adds a critical change: instead of removing WINAPI, the whole _WIN32 preprocessor block is deactivated. This fixes the BZ_API macro. This is necessary to fix runtime crashes in my application.
2013-01-30 17:10:28 +00:00
unsigned int* destLen,
char* source,
unsigned int sourceLen,
- int small,
+ int small_,
int verbosity
);