Mercurial > mxe-octave

view src/bzip2-1-fixes.patch @ 4618:de2eedecd6ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update broken PKG_UPDATE rules, handle missing update rules * Makefile.in: add handling for packages with no update rule * src/gtk2.mk, src/gtk3.mk, src/libvpx.mk, src/taglib.mk, src/hunspell.mk, src/vala.mk : use github tags for version info * src/llvm.mk: add '?' to update url * src/openscenegraph.mk: update SED rule for version extraction * src/pthread-stubs.mk, src/qt5.mk, src/renderproto.mk, src/sm.mk, src/s2tc.mk, src/util-macros.mk: added dummy PKG_UPDATE rule * src/qscintilla.mk: change search name for version extraction * src/qtbase.mk: use short pkg version in update path * src/suitesparse.mk: update change in main url/version url * src/tre.mk: update download page link * src/vmime.mk: update download and update url * src/wget.mk, src/xapian-core.mk: update url, sed rule * src/wt.mk: update to use github download/update * src/src-msys-libcrypt.mk: update sed rule
author John Donoghue
date Fri, 09 Mar 2018 11:46:42 -0500
parents 6409a12147fd
children 6a63ec73029d
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

diff -uNr bzip2-1.0.6.orig/bzip2.c bzip2-1.0.6/bzip2.c
--- bzip2-1.0.6.orig/bzip2.c	2010-09-11 01:04:53.000000000 +0200
+++ bzip2-1.0.6/bzip2.c	2013-01-30 16:24:00.170396872 +0100
@@ -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       '\\'
diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
--- bzip2-1.0.6.orig/bzlib.h	2010-09-11 01:08:42.000000000 +0200
+++ bzip2-1.0.6/bzlib.h	2013-01-30 16:22:10.514401460 +0100
@@ -75,7 +75,7 @@
 #include <stdio.h>
 #endif
 
-#ifdef _WIN32
+#if 0
 #   include <windows.h>
 #   ifdef small
       /* windows.h define small to char */
@@ -116,7 +116,7 @@
 BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
       bz_stream *strm, 
       int       verbosity, 
-      int       small
+      int       small_
    );
 
 BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
@@ -140,7 +140,7 @@
       int*  bzerror,   
       FILE* f, 
       int   verbosity, 
-      int   small,
+      int   small_,
       void* unused,    
       int   nUnused 
    );
@@ -216,7 +216,7 @@
       unsigned int* destLen,
       char*         source, 
       unsigned int  sourceLen,
-      int           small, 
+      int           small_, 
       int           verbosity 
    );