Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for issue of 32-bit z_off64_t with MinGW{-w64} while _LARGEFILE64_SOURCE=1 & _LFS64_LARGEFILE=1. #934

Closed
wants to merge 4 commits into from
Closed

Fix for issue of 32-bit z_off64_t with MinGW{-w64} while _LARGEFILE64_SOURCE=1 & _LFS64_LARGEFILE=1. #934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13563b7
Fix *64() function issue for MinGW{-w64}.
dbjh Feb 11, 2024
d162d0f
Merge branch 'develop' into mingw-fix
dbjh Feb 12, 2024
0f56c5a
- Proper fix for issue with MinGW{-w64} that is independent of header…
dbjh Feb 27, 2024
660b773
Merge branch 'madler:develop' into mingw-fix
dbjh Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into mingw-fix
  • Loading branch information
@dbjh
dbjh committed Feb 12, 2024
commit d162d0fb1c332369485d89e489aa73f6b81384dc
8 changes: 2 additions & 6 deletions zconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,16 +511,12 @@ typedef uLong FAR uLongf;

#if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t
#elif defined(_WIN32) && !defined(__GNUC__)
#elif defined(_WIN32) && !defined(__CYGWIN__)
# define z_off64_t __int64
#elif defined(__GO32__)
# define z_off64_t offset_t
#else
# if defined(_WIN32) && !defined(__CYGWIN__)
# define z_off64_t __int64
# else
# define z_off64_t z_off_t
# endif
# define z_off64_t z_off_t
#endif

/* MVS linker does not support external names larger than 8 bytes */
Expand Down
8 changes: 2 additions & 6 deletions zconf.h.cmakein
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,16 +513,12 @@ typedef uLong FAR uLongf;

#if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t
#elif defined(_WIN32) && !defined(__GNUC__)
#elif defined(_WIN32) && !defined(__CYGWIN__)
# define z_off64_t __int64
#elif defined(__GO32__)
# define z_off64_t offset_t
#else
# if defined(_WIN32) && !defined(__CYGWIN__)
# define z_off64_t __int64
# else
# define z_off64_t z_off_t
# endif
# define z_off64_t z_off_t
#endif

/* MVS linker does not support external names larger than 8 bytes */
Expand Down
8 changes: 2 additions & 6 deletions zconf.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,16 +511,12 @@ typedef uLong FAR uLongf;

#if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t
#elif defined(_WIN32) && !defined(__GNUC__)
#elif defined(_WIN32) && !defined(__CYGWIN__)
# define z_off64_t __int64
#elif defined(__GO32__)
# define z_off64_t offset_t
#else
# if defined(_WIN32) && !defined(__CYGWIN__)
# define z_off64_t __int64
# else
# define z_off64_t z_off_t
# endif
# define z_off64_t z_off_t
#endif

/* MVS linker does not support external names larger than 8 bytes */
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.