diff options
Diffstat (limited to 'ext/standard/md5.c')
| -rw-r--r-- | ext/standard/md5.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/standard/md5.c b/ext/standard/md5.c index 648d89e71a..9056f5b7ec 100644 --- a/ext/standard/md5.c +++ b/ext/standard/md5.c @@ -169,16 +169,16 @@ PHP_NAMED_FUNCTION(php_if_md5_file) */ #if defined(__i386__) || defined(__x86_64__) || defined(__vax__) # define SET(n) \ - (*(php_uint32 *)&ptr[(n) * 4]) + (*(uint32_t *)&ptr[(n) * 4]) # define GET(n) \ SET(n) #else # define SET(n) \ (ctx->block[(n)] = \ - (php_uint32)ptr[(n) * 4] | \ - ((php_uint32)ptr[(n) * 4 + 1] << 8) | \ - ((php_uint32)ptr[(n) * 4 + 2] << 16) | \ - ((php_uint32)ptr[(n) * 4 + 3] << 24)) + (uint32_t)ptr[(n) * 4] | \ + ((uint32_t)ptr[(n) * 4 + 1] << 8) | \ + ((uint32_t)ptr[(n) * 4 + 2] << 16) | \ + ((uint32_t)ptr[(n) * 4 + 3] << 24)) # define GET(n) \ (ctx->block[(n)]) #endif @@ -190,8 +190,8 @@ PHP_NAMED_FUNCTION(php_if_md5_file) static const void *body(PHP_MD5_CTX *ctx, const void *data, size_t size) { const unsigned char *ptr; - php_uint32 a, b, c, d; - php_uint32 saved_a, saved_b, saved_c, saved_d; + uint32_t a, b, c, d; + uint32_t saved_a, saved_b, saved_c, saved_d; ptr = data; @@ -307,8 +307,8 @@ PHPAPI void PHP_MD5Init(PHP_MD5_CTX *ctx) PHPAPI void PHP_MD5Update(PHP_MD5_CTX *ctx, const void *data, size_t size) { - php_uint32 saved_lo; - php_uint32 used, free; + uint32_t saved_lo; + uint32_t used, free; saved_lo = ctx->lo; if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo) { @@ -342,7 +342,7 @@ PHPAPI void PHP_MD5Update(PHP_MD5_CTX *ctx, const void *data, size_t size) PHPAPI void PHP_MD5Final(unsigned char *result, PHP_MD5_CTX *ctx) { - php_uint32 used, free; + uint32_t used, free; used = ctx->lo & 0x3f; |