From: Joe Watkins <krakjoe@php.net>
Date: Sat, 21 Jan 2017 07:45:28 +0000 (+0000)
Subject: Fix bug #73961 environmental build dependency in hash sha3 source
X-Git-Tag: php-7.1.2RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ff27053f9ffc7c68cf71b6cfb072583e2e7a610;p=php

Fix bug #73961 environmental build dependency in hash sha3 source
---

diff --git a/NEWS b/NEWS
index baed4466b7..74af8c58d5 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ PHP                                                                        NEWS
 
 - Hash:
   . Added hash_hkdf() function. (Andrey Andreev)
+  . Fixed bug #73961 (environmental build dependency in hash sha3 source).
+    (krakjoe)
 
 - Intl:
   . Fix bug #73956 (Link use CC instead of CXX). (Remi)
diff --git a/ext/hash/hash_sha3.c b/ext/hash/hash_sha3.c
index d6eb1a0f39..d190ae430b 100644
--- a/ext/hash/hash_sha3.c
+++ b/ext/hash/hash_sha3.c
@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
+#include "php_hash.h"
 #include "php_hash_sha3.h"
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && \
diff --git a/ext/hash/php_hash_sha3.h b/ext/hash/php_hash_sha3.h
index e16ff214dd..8b70ef4a7e 100644
--- a/ext/hash/php_hash_sha3.h
+++ b/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)