From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 12 Jul 2020 21:52:22 +0000 (+0200)
Subject: Fix PDO_Firebird numeric to string conversion on Windows
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9639cffdb9752e537518086fee545dd5aeffe04;p=php

Fix PDO_Firebird numeric to string conversion on Windows

Commit aaa1f90[1] dropped support for the `snprinf()` `I` modifier, so
we use the standard `ll` modifier which is suitable for 32bit and 64bit
Windows.  We also replace the deprecated `I64` suffix[2] with the `LL`
suffix.

This fixes ext/pdo_firebird/tests/bug_64037.phpt.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=aaa1f90e3f90c24098fa55a7b868fdca0b89ee25>
[2] <https://docs.microsoft.com/en-us/cpp/cpp/numeric-boolean-and-pointer-literals-cpp?view=vs-2019#integer-literals>
---

diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h b/ext/pdo_firebird/php_pdo_firebird_int.h
index 1528b417ae..094767fa35 100644
--- a/ext/pdo_firebird/php_pdo_firebird_int.h
+++ b/ext/pdo_firebird/php_pdo_firebird_int.h
@@ -37,13 +37,8 @@
 # define LL_MASK "l"
 # define LL_LIT(lit) lit ## L
 #else
-# ifdef PHP_WIN32
-#  define LL_MASK "I64"
-#  define LL_LIT(lit) lit ## I64
-# else
-#  define LL_MASK "ll"
-#  define LL_LIT(lit) lit ## LL
-# endif
+# define LL_MASK "ll"
+# define LL_LIT(lit) lit ## LL
 #endif
 
 /* Firebird API has a couple of missing const decls in its API */