basic clang compatibility on windows

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 3cd5d6aa5f9d942eed7b30551686536bd9e4dd18..5577194b0c796fbba5aaf9c6b07468df0d41082b 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -100,7 +100,7 @@ static const uint32_t uninitialized_bucket = {INVALID_IDX};
 ZEND_API void _zend_hash_init(HashTable *ht, uint32_t nSize, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC)
 {
        /* Use big enough power of 2 */
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) && !defined(__clang__)
        if (nSize <= 8) {
                ht->nTableSize = 8;
        } else if (nSize >= 0x80000000) {

diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index c159fdc77b417aa61a945f9d150e60f6a66dff61..a6dac42b5a291adc3fadb2fc443de0b5f94e8993 100644 (file)
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -74,6 +74,10 @@
 # include <alloca.h>
 #endif
 
+#if defined(ZEND_WIN32)
+#include <intrin.h>
+#endif
+
 /* Only use this macro if you know for sure that all of the switches values
    are covered by its case statements */
 #if ZEND_DEBUG

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index ee0e025c5df58ca9d5e00e2f155293c3db33217e..5adc9a9a118770ceaac719df153d412ba8f82e1e 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -34,6 +34,10 @@
 
 #include "url_scanner_ex.h"
 
+#if defined(_WIN32) && defined(__clang__)
+#include <intrin.h>
+#endif
+
 extern zend_module_entry basic_functions_module;
 #define basic_functions_module_ptr &basic_functions_module