com php-src: better fix (also fix i386 build): ext/zip/lib/zipint.h
| From: | Remi Collet | Date: | Wed, 06 May 2015 14:59:50 +0000 |
| Subject: | com php-src: better fix (also fix i386 build): ext/zip/lib/zipint.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86625@lists.php.net to get a copy of this message | ||
Commit: d1363e30fdd03431c7768aa2a4b7361bf07f42fd
Author: Remi Collet <remi@php.net> Wed, 6 May 2015 16:59:50 +0200
Parents: 31f95eaefbfed9f03346d046621cfbdb3cc68268
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d1363e30fdd03431c7768aa2a4b7361bf07f42fd
Log:
better fix (also fix i386 build)
Changed paths:
M ext/zip/lib/zipint.h
Diff:
diff --git a/ext/zip/lib/zipint.h b/ext/zip/lib/zipint.h
index 1296025..d13bab4 100644
--- a/ext/zip/lib/zipint.h
+++ b/ext/zip/lib/zipint.h
@@ -130,11 +130,11 @@ int _zip_mkstemp(char *);
#define ZIP_FSEEK_MAX ZIP_OFF_MAX
#define ZIP_FSEEK_MIN ZIP_OFF_MIN
#elif SIZEOF_LONG >= 8
-#define ZIP_FSEEK_MAX (zip_int64_t)ZIP_INT64_MAX
-#define ZIP_FSEEK_MIN (zip_int64_t)ZIP_INT64_MIN
+#define ZIP_FSEEK_MAX (long)ZIP_INT64_MAX
+#define ZIP_FSEEK_MIN (long)ZIP_INT64_MIN
#else
-#define ZIP_FSEEK_MAX ZIP_INT32_MAX
-#define ZIP_FSEEK_MIN ZIP_INT32_MIN
+#define ZIP_FSEEK_MAX (long)ZIP_INT32_MAX
+#define ZIP_FSEEK_MIN (long)ZIP_INT32_MIN
#endif
#ifndef SIZE_MAX