[iortcw] 475/497: All: Fix the defines for OSX in minizip
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit ab6b4571430f22a1e8b378d029687cfde473009e Author: MAN-AT-ARMS Date: Sat Dec 12 11:24:30 2015 -0500 All: Fix the defines for OSX in minizip --- MP/code/zlib-1.2.8/ioapi.c | 2 +- MP/code/zlib-1.2.8/ioapi.h | 2 +- SP/code/zlib-1.2.8/ioapi.c | 2 +- SP/code/zlib-1.2.8/ioapi.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP/code/zlib-1.2.8/ioapi.c b/MP/code/zlib-1.2.8/ioapi.c index 15cb49b..f1c3aec 100644 --- a/MP/code/zlib-1.2.8/ioapi.c +++ b/MP/code/zlib-1.2.8/ioapi.c @@ -14,7 +14,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__MACOS_X__) || defined(IOAPI_NO_64) +#if defined(MACOS_X) || defined(IOAPI_NO_64) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/MP/code/zlib-1.2.8/ioapi.h b/MP/code/zlib-1.2.8/ioapi.h index 2343e90..f951d26 100644 --- a/MP/code/zlib-1.2.8/ioapi.h +++ b/MP/code/zlib-1.2.8/ioapi.h @@ -21,7 +21,7 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__MACOS_X__)) +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(MACOS_X)) // Linux needs this to support file operation on files larger then 4+GB // But might need better if/def to select just the platforms that needs them. diff --git a/SP/code/zlib-1.2.8/ioapi.c b/SP/code/zlib-1.2.8/ioapi.c index 15cb49b..f1c3aec 100644 --- a/SP/code/zlib-1.2.8/ioapi.c +++ b/SP/code/zlib-1.2.8/ioapi.c @@ -14,7 +14,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__MACOS_X__) || defined(IOAPI_NO_64) +#if defined(MACOS_X) || defined(IOAPI_NO_64) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/SP/code/zlib-1.2.8/ioapi.h b/SP/code/zlib-1.2.8/ioapi.h index 2343e90..f951d26 100644 --- a/SP/code/zlib-1.2.8/ioapi.h +++ b/SP/code/zlib-1.2.8/ioapi.h @@ -21,7 +21,7 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__MACOS_X__)) +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(MACOS_X)) // Linux needs this to support file operation on files larger then 4+GB // But might need better if/def to select just the platforms that needs them. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 475/497: All: Fix the defines for OSX in minizip
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit ab6b4571430f22a1e8b378d029687cfde473009e Author: MAN-AT-ARMS Date: Sat Dec 12 11:24:30 2015 -0500 All: Fix the defines for OSX in minizip --- MP/code/zlib-1.2.8/ioapi.c | 2 +- MP/code/zlib-1.2.8/ioapi.h | 2 +- SP/code/zlib-1.2.8/ioapi.c | 2 +- SP/code/zlib-1.2.8/ioapi.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP/code/zlib-1.2.8/ioapi.c b/MP/code/zlib-1.2.8/ioapi.c index 15cb49b..f1c3aec 100644 --- a/MP/code/zlib-1.2.8/ioapi.c +++ b/MP/code/zlib-1.2.8/ioapi.c @@ -14,7 +14,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__MACOS_X__) || defined(IOAPI_NO_64) +#if defined(MACOS_X) || defined(IOAPI_NO_64) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/MP/code/zlib-1.2.8/ioapi.h b/MP/code/zlib-1.2.8/ioapi.h index 2343e90..f951d26 100644 --- a/MP/code/zlib-1.2.8/ioapi.h +++ b/MP/code/zlib-1.2.8/ioapi.h @@ -21,7 +21,7 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__MACOS_X__)) +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(MACOS_X)) // Linux needs this to support file operation on files larger then 4+GB // But might need better if/def to select just the platforms that needs them. diff --git a/SP/code/zlib-1.2.8/ioapi.c b/SP/code/zlib-1.2.8/ioapi.c index 15cb49b..f1c3aec 100644 --- a/SP/code/zlib-1.2.8/ioapi.c +++ b/SP/code/zlib-1.2.8/ioapi.c @@ -14,7 +14,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__MACOS_X__) || defined(IOAPI_NO_64) +#if defined(MACOS_X) || defined(IOAPI_NO_64) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/SP/code/zlib-1.2.8/ioapi.h b/SP/code/zlib-1.2.8/ioapi.h index 2343e90..f951d26 100644 --- a/SP/code/zlib-1.2.8/ioapi.h +++ b/SP/code/zlib-1.2.8/ioapi.h @@ -21,7 +21,7 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__MACOS_X__)) +#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(MACOS_X)) // Linux needs this to support file operation on files larger then 4+GB // But might need better if/def to select just the platforms that needs them. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits