Skip to content

Commit a54e624

Browse files
author
jan.nijtmans
committed
Undo 2 Tcl-specific changes in zlib: those are no longer necessary
1 parent e7293f1 commit a54e624

2 files changed

Lines changed: 2 additions & 10 deletions

File tree

compat/zlib/contrib/minizip/ioapi.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
#define _CRT_SECURE_NO_WARNINGS
1515
#endif
1616

17-
#if defined(_WIN32)
18-
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
19-
#define FTELLO_FUNC(stream) _ftelli64(stream)
20-
#define FSEEKO_FUNC(stream, offset, origin) _fseeki64(stream, offset, origin)
21-
#elif defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
17+
#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
2218
/* In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions */
2319
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
2420
#define FTELLO_FUNC(stream) ftello(stream)

compat/zlib/contrib/minizip/minizip.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@
2828
#endif
2929
#endif
3030

31-
#if defined(_WIN32)
32-
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
33-
#define FTELLO_FUNC(stream) _ftelli64(stream)
34-
#define FSEEKO_FUNC(stream, offset, origin) _fseeki64(stream, offset, origin)
35-
#elif defined(__APPLE__) || defined(IOAPI_NO_64)
31+
#if defined(__APPLE__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
3632
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
3733
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
3834
#define FTELLO_FUNC(stream) ftello(stream)

0 commit comments

Comments
 (0)