Mercurial > mxe-octave

view src/bzip2-1-fixes.patch @ 6113:24e29dcb2e64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 6a63ec73029d
children
line wrap: on
line source

diff -ur bzip2-1.0.8.orig/bzlib.h bzip2-1.0.8/bzlib.h
--- bzip2-1.0.8.orig/bzlib.h	2020-01-06 13:24:42.229947041 -0500
+++ bzip2-1.0.8/bzlib.h	2020-01-06 13:27:27.946095881 -0500
@@ -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 
    );