From: Anatol Belski <ab@php.net>
Date: Sat, 20 Sep 2014 13:46:19 +0000 (+0200)
Subject: refixed printf fmt, used portable macros
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=763bfb4f3b0e66d5a961f9f367aa86e9f9da262e;p=php

refixed printf fmt, used portable macros
---

diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c
index ee68cec027..5f28bd7b9f 100644
--- a/ext/standard/crypt_sha256.c
+++ b/ext/standard/crypt_sha256.c
@@ -520,7 +520,7 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b
 
 	if (rounds_custom) {
 #ifdef PHP_WIN32
-		int n = _snprintf(cp, MAX(0, buflen), "%s%I64u$", sha256_rounds_prefix, rounds);
+		int n = _snprintf(cp, MAX(0, buflen), "%s" ZEND_ULONG_FMT "$", sha256_rounds_prefix, rounds);
 #else
 		int n = snprintf(cp, MAX(0, buflen), "%s%zu$", sha256_rounds_prefix, rounds);
 #endif
diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c
index 9e5def38c5..df5f3d109e 100644
--- a/ext/standard/crypt_sha512.c
+++ b/ext/standard/crypt_sha512.c
@@ -555,7 +555,7 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
 
 	if (rounds_custom) {
 #ifdef PHP_WIN32
-	  int n = _snprintf(cp, MAX(0, buflen), "%s%I64u$", sha512_rounds_prefix, rounds);
+	  int n = _snprintf(cp, MAX(0, buflen), "%s" ZEND_ULONG_FMT "$", sha512_rounds_prefix, rounds);
 #else
 	  int n = snprintf(cp, MAX(0, buflen), "%s%zu$", sha512_rounds_prefix, rounds);
 #endif