Skip to content

Commit c9639cf

Browse files
committed
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>
1 parent b6e70e1 commit c9639cf

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

ext/pdo_firebird/php_pdo_firebird_int.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,8 @@
3737
# define LL_MASK "l"
3838
# define LL_LIT(lit) lit ## L
3939
#else
40-
# ifdef PHP_WIN32
41-
# define LL_MASK "I64"
42-
# define LL_LIT(lit) lit ## I64
43-
# else
44-
# define LL_MASK "ll"
45-
# define LL_LIT(lit) lit ## LL
46-
# endif
40+
# define LL_MASK "ll"
41+
# define LL_LIT(lit) lit ## LL
4742
#endif
4843

4944
/* Firebird API has a couple of missing const decls in its API */

0 commit comments

Comments
 (0)