Sync fix for bug #72498 for 32-bit

diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 4cfe72fc9993f4434191dd849d9e15a0bd680ddd..a746d61837a7fe288dc97bb6112bfd78a9bc77c1 100644 (file)
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -1012,13 +1012,13 @@ PHP_FUNCTION(variant_date_from_timestamp)
        tzset();
        ttstamp = timestamp;
        tmv = localtime(&ttstamp);
-#if ZEND_ENABLE_ZVAL_LONG64
+
        /* Invalid after 23:59:59, December 31, 3000, UTC */
        if (!tmv) {
                php_error_docref(NULL, E_WARNING, "Invalid timestamp " ZEND_LONG_FMT, timestamp);
                RETURN_FALSE;
        }
-#endif
+
        memset(&systime, 0, sizeof(systime));
 
        systime.wDay = tmv->tm_mday;

diff --git a/ext/com_dotnet/tests/bug72498.phpt b/ext/com_dotnet/tests/bug72498.phpt
index e155735ba53af4e70713118674da03e9a5ff3577..c5aad0ccccf4f760045c46185bf49bf4e589063b 100644 (file)
--- a/ext/com_dotnet/tests/bug72498.phpt
+++ b/ext/com_dotnet/tests/bug72498.phpt
@@ -3,7 +3,6 @@ Bug #72498 variant_date_from_timestamp null dereference
 --SKIPIF--
 <?php # vim:ft=php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
-if (PHP_INT_SIZE != 8) print  "skip 64-bit only";
 ?>
 --FILE--
 <?php