From: Remi Collet Date: Fri, 9 Jun 2017 07:22:05 +0000 (+0200) Subject: cleanup X-Git-Tag: php-7.2.0alpha2~51 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75cda24b823a17f38e2ecca227a8c41bda00970c;p=php cleanup ssite_t is used in lot of places, without need for this. If really needed, should be in global location, not in an extension --- diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index e6035bccee..6422b8f593 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -188,21 +188,6 @@ in esac AC_SUBST([MANFMT]) -AH_BOTTOM([ -#ifndef HAVE_SSIZE_T -# if SIZEOF_SIZE_T == SIZEOF_INT -typedef int ssize_t; -# elif SIZEOF_SIZE_T == SIZEOF_LONG -typedef long ssize_t; -# elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG -typedef long long ssize_t; -# else -#error no suitable type for ssize_t found -# endif -#endif -]) - - dnl so we always include the known-good working hack. PHP_ADD_MAKEFILE_FRAGMENT fi diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c index 2ed584021d..8e7dbcf769 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -30,6 +30,9 @@ #include "ext/standard/url.h" +/* needed for ssize_t definition */ +#include + struct php_zip_stream_data_t { struct zip *za; struct zip_file *zf;