From: Nikita Popov <nikic@php.net>
Date: Thu, 3 Mar 2016 15:50:47 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~534
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f57c0b324912ae3fce7940b836e35ca368cbd0ad;p=php

Merge branch 'PHP-7.0'
---

f57c0b324912ae3fce7940b836e35ca368cbd0ad
diff --cc ext/phar/phar_internal.h
index 610482b290,e0ae624dc9..cd562ea411
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@@ -196,13 -198,22 +196,13 @@@ ZEND_EXTERN_MODULE_GLOBALS(phar
  #define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v)
  
  #if defined(ZTS) && defined(COMPILE_DL_PHAR)
- ZEND_TSRMLS_CACHE_EXTERN();
+ ZEND_TSRMLS_CACHE_EXTERN()
  #endif
  
 -#ifndef php_uint16
 -# if SIZEOF_SHORT == 2
 -#  define php_uint16 unsigned short
 -# else
 -#  define php_uint16 uint16_t
 -# endif
 -#endif
  #include "pharzip.h"
  
 -#if HAVE_SPL
  typedef union _phar_archive_object  phar_archive_object;
  typedef union _phar_entry_object    phar_entry_object;
 -#endif
  
  /*
   * used in phar_entry_info->fp_type to