Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix bug #73961 environmental build dependency in hash sha3 source

Author: krakjoe

NEWS

@@ -58,6 +58,10 @@ PHP                                                                        NEWS
 - GMP:
   . Fixed bug #70896 (gmp_fact() silently ignores non-integer input). (Sara)
 
+- hash:
+  . Fixed bug #73961 (environmental build dependency in hash sha3 source).
+    (krakjoe)
+
 - Mbstring:
   . Implemented request #66024 (mb_chr() and mb_ord()). (Masakielastic, Yasuo)
   . Implemented request #65081 (mb_scrub()). (Masakielastic, Yasuo)

ext/hash/hash_sha3.c

@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
+#include "php_hash.h"
 #include "php_hash_sha3.h"
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && \

ext/hash/php_hash_sha3.h

@@ -20,7 +20,6 @@
 #define PHP_HASH_SHA3_H
 
 #include "php.h"
-#include "ext/hash/php_hash.h"
 
 typedef struct {
 	unsigned char state[200]; // 5 * 5 * sizeof(uint64)