From: Anatol Belski <ab@php.net>
Date: Thu, 13 Oct 2016 08:08:10 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1146^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afbb3b858aae68925b095668841e7a3971714c0f;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use already exported symbol
  Revert "export symbol missing by phpdbg"
---

afbb3b858aae68925b095668841e7a3971714c0f
diff --cc Zend/zend_string.h
index 1bc3c86305,722fc3ae46..8a1ac6f506
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@@ -32,10 -32,7 +32,8 @@@ ZEND_API extern void (*zend_interned_st
  ZEND_API zend_ulong zend_hash_func(const char *str, size_t len);
  void zend_interned_strings_init(void);
  void zend_interned_strings_dtor(void);
 +void zend_known_interned_strings_init(zend_string ***, uint32_t *);
  
- ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...);
- 
  END_EXTERN_C()
  
  /* Shortcuts */