mirror/nasm
1
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2026-01-26 16:09:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

zlib: hack for portability...

Browse Source 
zlib/zconf.h is ... "special".

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2025-09-05 19:59:12 -07:00
parent e52aa40daa
commit 76df52818a
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zlib/adler32.c
View File

@ -159,6 +159,10 @@ uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) {
return adler32_combine_(adler1, adler2, len2);
}
#if 0 /* NASM hack */
uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) {
return adler32_combine_(adler1, adler2, len2);
}
#endif

2
zlib/crc32.c
View File

@ -1018,6 +1018,7 @@ unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf,
}
/* ========================================================================= */
static /* NASM hack */
uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
#ifdef DYNAMIC_CRC_TABLE
once(&made, make_crc_table);
@ -1031,6 +1032,7 @@ uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
}
/* ========================================================================= */
static /* NASM hack */
uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) {
#ifdef DYNAMIC_CRC_TABLE
once(&made, make_crc_table);

10
zlib/zconf.h
View File

@ -12,6 +12,8 @@
#define HAVE_VSNPRINTF 1 /* If it doesn't exist we add it */
#define Z_SOLO 1
#define z_off_t off_t
#define z_off64_t off_t
/*
* If you *really* need a unique prefix for all types and library functions,
@ -438,6 +440,8 @@ typedef uLong FAR uLongf;
typedef unsigned long z_crc_t;
#endif
#if 0 /* NASM hack: this breaks stuff */
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
@ -501,11 +505,11 @@ typedef uLong FAR uLongf;
#endif
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
# define Z_LARGE64
# define Z_LARGE64
#endif
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
# define Z_WANT64
# define Z_WANT64
#endif
#if !defined(SEEK_SET) && !defined(Z_SOLO)
@ -528,6 +532,8 @@ typedef uLong FAR uLongf;
# endif
#endif
#endif /* NASM hack */
/* MVS linker does not support external names larger than 8 bytes */
#if defined(__MVS__)
#pragma map(deflateInit_,"DEIN")