From fffbc6d40ae7306a5ee18783cd94e4f2325ba54e Mon Sep 17 00:00:00 2001 From: luigi Date: Wed, 9 Jul 2014 14:30:35 +0000 Subject: [PATCH] fixed a seg. fault with zziplib and MINGW git-svn-id: https://foundry.supelec.fr/svn/luatex/trunk@5034 0b2b3880-5936-4365-a048-eb17d2e5a6bf --- .../zziplib/zziplib-0.13.62-PATCHES/patch-01-__mmap.h | 17 +++++++++++++++++ source/libs/zziplib/zziplib-0.13.62/zzip/__mmap.h | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-__mmap.h diff --git a/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-__mmap.h b/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-__mmap.h new file mode 100644 index 000000000..5d33313f3 --- /dev/null +++ b/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-__mmap.h @@ -0,0 +1,17 @@ +--- __mmap.h.orig 2014-07-09 15:34:11.605722375 +0200 ++++ __mmap.h 2014-07-09 16:11:23.985628493 +0200 +@@ -17,11 +17,13 @@ + * of the Mozilla Public License 1.1 + */ + ++ ++ + #ifdef _USE_MMAP + #if defined ZZIP_HAVE_SYS_MMAN_H + #include + #define USE_POSIX_MMAP 1 +-#elif defined ZZIP_HAVE_WINBASE_H || defined WIN32 ++#elif (defined ZZIP_HAVE_WINBASE_H || defined WIN32) && !(defined __MINGW32__ || defined __MINGW64__) + #include + #define USE_WIN32_MMAP 1 + #else diff --git a/source/libs/zziplib/zziplib-0.13.62/zzip/__mmap.h b/source/libs/zziplib/zziplib-0.13.62/zzip/__mmap.h index d70419dcb..6eb76fca3 100644 --- a/source/libs/zziplib/zziplib-0.13.62/zzip/__mmap.h +++ b/source/libs/zziplib/zziplib-0.13.62/zzip/__mmap.h @@ -17,11 +17,13 @@ * of the Mozilla Public License 1.1 */ + + #ifdef _USE_MMAP #if defined ZZIP_HAVE_SYS_MMAN_H #include #define USE_POSIX_MMAP 1 -#elif defined ZZIP_HAVE_WINBASE_H || defined WIN32 +#elif (defined ZZIP_HAVE_WINBASE_H || defined WIN32) && !(defined __MINGW32__ || defined __MINGW64__) #include #define USE_WIN32_MMAP 1 #else -- 2.11.4.GIT