From: foobar <sniper@php.net>
Date: Wed, 22 Aug 2001 08:34:04 +0000 (+0000)
Subject: Killed a compile warning.
X-Git-Tag: PRE_SUBST_Z_MACROS~397
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5296d29b59b243ac739d7145fd6bd51f1f4c7ea7;p=php

Killed a compile warning.
---

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 71d6fef02c..fc555819cb 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -883,8 +883,9 @@ static void process_EXIF (ImageInfoType *ImageInfo, char *CharBuf, unsigned int
 static int scan_JPEG_header (ImageInfoType *ImageInfo, FILE *infile, Section_t *Sections, int *SectionsRead, int ReadAll, char *LastExifRefd)
 {
     int a;
+/*
     int HaveCom = FALSE;
-
+*/
     a = fgetc(infile);
     if (a != 0xff || fgetc(infile) != M_SOI) {
         return FALSE;
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index a0a96742d3..1d1d854626 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2257,7 +2257,7 @@ PHP_FUNCTION(imagefontheight)
 
 /* {{{ php_gdimagecharup
  * workaround for a bug in gd 1.2 */
-void php_gdimagecharup(gdImagePtr im, gdFontPtr f, int x, int y, int c, int color)
+static void php_gdimagecharup(gdImagePtr im, gdFontPtr f, int x, int y, int c, int color)
 {
 	int cx, cy, px, py, fline;
 	cx = 0;
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index f29695831b..378936c42f 100644
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -146,7 +146,6 @@ PHP_FUNCTION(imagestring);
 PHP_FUNCTION(imagestringup);
 PHP_FUNCTION(imagesx);
 PHP_FUNCTION(imagesy);
-static void php_gdimagecharup(gdImagePtr, gdFontPtr, int, int, int, int);
 PHP_FUNCTION(imagedashedline);
 PHP_FUNCTION(imagettfbbox);
 PHP_FUNCTION(imagettftext);
diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c
index 5ab4dead5d..acf0a9289d 100644
--- a/ext/zlib/zlib_fopen_wrapper.c
+++ b/ext/zlib/zlib_fopen_wrapper.c
@@ -75,7 +75,7 @@ FILE *zlib_fopen_wrapper(const char *path, char *mode, int options, int *issock,
 		
 		path++;
 
-		fp = php_fopen_wrapper(path, mode, options|IGNORE_URL, &fissock, &fsocketd, NULL TSRMLS_CC);
+		fp = php_fopen_wrapper((char *) path, mode, options|IGNORE_URL, &fissock, &fsocketd, NULL TSRMLS_CC);
 		
 		if (!fp) {
 			free(gc);