From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 5 Mar 2018 23:47:01 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.4RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=020a02ef9d9bbd14d9f37a5d50020f2a4cbea778;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
---

020a02ef9d9bbd14d9f37a5d50020f2a4cbea778
diff --cc ext/opcache/zend_persist.h
index 51959a22ea,166c08fd13..73f0215a65
--- a/ext/opcache/zend_persist.h
+++ b/ext/opcache/zend_persist.h
@@@ -23,7 -23,7 +23,7 @@@
  #define ZEND_PERSIST_H
  
  int zend_accel_script_persistable(zend_persistent_script *script);
 -uint zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length, int for_shm);
 +uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length, int for_shm);
- zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length);
+ zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length, int for_shm);
  
  #endif /* ZEND_PERSIST_H */