- merge fix build for sha

diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c
index 7e632de9f7bf61f89c566734d3860cf519855c5c..eb839ef0e6559435bd7e046b82ced98e92561cfe 100644 (file)
--- a/ext/standard/crypt_sha256.c
+++ b/ext/standard/crypt_sha256.c
@@ -2,10 +2,8 @@
    Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>.  */
 /* Windows VC++ port by Pierre Joye <pierre@php.net> */
 
-#ifndef PHP_WIN32
-# include "php.h"
-# include "php_main.h"
-#endif
+#include "php.h"
+#include "php_main.h"
 
 #include <errno.h>
 #include <limits.h>

diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c
index f339dbb8103e0f91c1ccd0d31874d01aa09d0f0f..c5ca6461ff2068f58accf4dac18547bb2336ac6d 100644 (file)
--- a/ext/standard/crypt_sha512.c
+++ b/ext/standard/crypt_sha512.c
@@ -2,10 +2,8 @@
    Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>.  */
 /* Windows VC++ port by Pierre Joye <pierre@php.net> */
 
-#ifndef PHP_WIN32
-# include "php.h"
-# include "php_main.h"
-#endif
+#include "php.h"
+#include "php_main.h"
 
 #include <errno.h>
 #include <limits.h>