Selaa lähdekoodia

make it compile with PHP 7.4 on Windows

Jan-E 5 vuotta sitten
vanhempi
commit
672d6952fd
4 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 2 0
      php_v8js_macros.h
  2. 1 1
      v8js_convert.cc
  3. 1 1
      v8js_methods.cc
  4. 1 1
      v8js_object_export.cc

+ 2 - 0
php_v8js_macros.h

@@ -31,7 +31,9 @@
 #include <cmath>
 
 extern "C" {
+#ifndef _WIN32
 #include "php_config.h"
+#endif
 
 /* work around incompatibilities regarding isnan() and isfinite() macros,
  * affecting PHP versions before 7.4. */

+ 1 - 1
v8js_convert.cc

@@ -85,7 +85,7 @@ static v8::Local<v8::Value> v8js_hash_to_jsarr(zval *value, v8::Isolate *isolate
 	if (i > 0)
 	{
 		zval *data;
-		ulong index = 0;
+		zend_ulong index = 0;
 
 #if PHP_VERSION_ID >= 70300
 		if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE))

+ 1 - 1
v8js_methods.cc

@@ -364,7 +364,7 @@ V8JS_METHOD(require)
 		}
 
 		zval *data;
-		ulong index = 0;
+		zend_ulong index = 0;
 
 		ZEND_HASH_FOREACH_VAL(ht, data) {
 			if (Z_TYPE_P(data) != IS_STRING) {

+ 1 - 1
v8js_object_export.cc

@@ -627,7 +627,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::Name> property_n
 	v8js_ctx *ctx = (v8js_ctx *) isolate->GetData(0);
 	v8::String::Utf8Value cstr(isolate, property);
 	const char *name = ToCString(cstr);
-	uint name_len = cstr.length();
+	uint32_t name_len = cstr.length();
 	char *lower = estrndup(name, name_len);
 	zend_string *method_name;