From 1edadfd0037d62d4b58cb37f0fda7097078463f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 4 May 2022 13:46:36 +0200 Subject: [PATCH 1/3] Fix gmp_long/gmp_ulong typedef warning on Windows x86 --- ext/gmp/php_gmp_int.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/gmp/php_gmp_int.h b/ext/gmp/php_gmp_int.h index d4ef5f0157332..c37fdb136d023 100644 --- a/ext/gmp/php_gmp_int.h +++ b/ext/gmp/php_gmp_int.h @@ -28,7 +28,7 @@ static inline gmp_object *php_gmp_object_from_zend_object(zend_object *zobj) { PHP_GMP_API zend_class_entry *php_gmp_class_entry(void); /* GMP and MPIR use different datatypes on different platforms */ -#ifdef PHP_WIN32 +#ifdef _WIN64 typedef zend_long gmp_long; typedef zend_ulong gmp_ulong; #else From 6fe0a9e588e2ba19d4f9f16ce24d34358b1bffc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sat, 29 Apr 2023 12:19:10 +0200 Subject: [PATCH 2/3] #if not even needed --- ext/gmp/php_gmp_int.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ext/gmp/php_gmp_int.h b/ext/gmp/php_gmp_int.h index c37fdb136d023..7ec85fd08c605 100644 --- a/ext/gmp/php_gmp_int.h +++ b/ext/gmp/php_gmp_int.h @@ -28,12 +28,7 @@ static inline gmp_object *php_gmp_object_from_zend_object(zend_object *zobj) { PHP_GMP_API zend_class_entry *php_gmp_class_entry(void); /* GMP and MPIR use different datatypes on different platforms */ -#ifdef _WIN64 -typedef zend_long gmp_long; -typedef zend_ulong gmp_ulong; -#else typedef long gmp_long; typedef unsigned long gmp_ulong; -#endif #endif From d0fdf4de8c5fea3d32470479073887ddacf1ce08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sat, 29 Apr 2023 12:19:10 +0200 Subject: [PATCH 3/3] Revert "#if not even needed" This reverts commit 6fe0a9e588e2ba19d4f9f16ce24d34358b1bffc9. --- ext/gmp/php_gmp_int.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/gmp/php_gmp_int.h b/ext/gmp/php_gmp_int.h index 7ec85fd08c605..c37fdb136d023 100644 --- a/ext/gmp/php_gmp_int.h +++ b/ext/gmp/php_gmp_int.h @@ -28,7 +28,12 @@ static inline gmp_object *php_gmp_object_from_zend_object(zend_object *zobj) { PHP_GMP_API zend_class_entry *php_gmp_class_entry(void); /* GMP and MPIR use different datatypes on different platforms */ +#ifdef _WIN64 +typedef zend_long gmp_long; +typedef zend_ulong gmp_ulong; +#else typedef long gmp_long; typedef unsigned long gmp_ulong; +#endif #endif