From: foobar <sniper@php.net>
Date: Fri, 12 Jul 2002 22:34:43 +0000 (+0000)
Subject: - Fixed compile (bug #18297) on such systems which define uchar.
X-Git-Tag: dev~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48634e402662f45721c61318ec9cb015e00953f6;p=php

- Fixed compile (bug #18297) on such systems which define uchar.
---

diff --git a/ext/standard/image.c b/ext/standard/image.c
index b579da9ed7..80815e79d0 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -589,8 +589,6 @@ PHPAPI const int php_tiff_bytes_per_format[] = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8,
 #define TAG_FMT_SRATIONAL 10
 #define TAG_FMT_SINGLE    11
 #define TAG_FMT_DOUBLE    12
-
-typedef unsigned char uchar;
 /* }}} */
 
 /* {{{ php_ifd_get16u
@@ -598,9 +596,9 @@ typedef unsigned char uchar;
 static int php_ifd_get16u(void *Short, int motorola_intel)
 {
 	if (motorola_intel) {
-		return (((uchar *)Short)[0] << 8) | ((uchar *)Short)[1];
+		return (((unsigned char *)Short)[0] << 8) | ((unsigned char *)Short)[1];
 	} else {
-		return (((uchar *)Short)[1] << 8) | ((uchar *)Short)[0];
+		return (((unsigned char *)Short)[1] << 8) | ((unsigned char *)Short)[0];
 	}
 }
 /* }}} */
@@ -618,11 +616,11 @@ static signed short php_ifd_get16s(void *Short, int motorola_intel)
 static int php_ifd_get32s(void *Long, int motorola_intel)
 {
 	if (motorola_intel) {
-		return  ((( char *)Long)[0] << 24) | (((uchar *)Long)[1] << 16)
-		      | (((uchar *)Long)[2] << 8 ) | (((uchar *)Long)[3] << 0 );
+		return  ((( char *)Long)[0] << 24) | (((unsigned char *)Long)[1] << 16)
+		      | (((unsigned char *)Long)[2] << 8 ) | (((unsigned char *)Long)[3] << 0 );
 	} else {
-		return  ((( char *)Long)[3] << 24) | (((uchar *)Long)[2] << 16)
-		      | (((uchar *)Long)[1] << 8 ) | (((uchar *)Long)[0] << 0 );
+		return  ((( char *)Long)[3] << 24) | (((unsigned char *)Long)[2] << 16)
+		      | (((unsigned char *)Long)[1] << 8 ) | (((unsigned char *)Long)[0] << 0 );
 	}
 }
 /* }}} */